geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r524643 - in /geronimo/plugins/roller: derby/ derby/src/plan/ roller-derby-resources/ roller-derby-resources/src/main/assembly/ roller-derby-resources/src/main/resources/META-INF/ roller-war/src/main/assembly/
Date Sun, 01 Apr 2007 17:40:28 GMT
Author: djencks
Date: Sun Apr  1 10:40:27 2007
New Revision: 524643

URL: http://svn.apache.org/viewvc?view=rev&rev=524643
Log:
GERONIMO-2994 find a way to include the derby db stuff in a derby specific location.  Still
doesn't work

Added:
    geronimo/plugins/roller/roller-derby-resources/
      - copied from r520214, geronimo/plugins/roller/roller-war/
    geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/
    geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties
  (with props)
Modified:
    geronimo/plugins/roller/derby/pom.xml
    geronimo/plugins/roller/derby/src/plan/plan.xml
    geronimo/plugins/roller/roller-derby-resources/pom.xml
    geronimo/plugins/roller/roller-derby-resources/src/main/assembly/bin.xml
    geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml

Modified: geronimo/plugins/roller/derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/derby/pom.xml?view=diff&rev=524643&r1=524642&r2=524643
==============================================================================
--- geronimo/plugins/roller/derby/pom.xml (original)
+++ geronimo/plugins/roller/derby/pom.xml Sun Apr  1 10:40:27 2007
@@ -47,6 +47,13 @@
         </dependency>
         
         <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>geronimo-roller-derby-resources</artifactId>
+            <version>${version}</version>
+            <type>jar</type>
+        </dependency>
+        
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
             <version>${version}</version>

Modified: geronimo/plugins/roller/derby/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/derby/src/plan/plan.xml?view=diff&rev=524643&r1=524642&r2=524643
==============================================================================
--- geronimo/plugins/roller/derby/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/derby/src/plan/plan.xml Sun Apr  1 10:40:27 2007
@@ -40,4 +40,11 @@
             </connection-definition>
         </outbound-resourceadapter>
     </resourceadapter>
+    <gbean name="DaytraderResources" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+        <attribute name="testSQL">select * from userrole where 1 = 2</attribute>
+        <attribute name="path">META-INF/derby/createdb.sql</attribute>
+        <reference name="DataSource">
+            <name>jdbc/rollerdb</name>
+        </reference>
+    </gbean>
 </connector>

Modified: geronimo/plugins/roller/roller-derby-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-derby-resources/pom.xml?view=diff&rev=524643&r1=520214&r2=524643
==============================================================================
--- geronimo/plugins/roller/roller-derby-resources/pom.xml (original)
+++ geronimo/plugins/roller/roller-derby-resources/pom.xml Sun Apr  1 10:40:27 2007
@@ -32,8 +32,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>geronimo-roller-war</artifactId>
-    <name>Geronimo Configs :: Roller war repackaging from tgz</name>
+    <artifactId>geronimo-roller-derby-resources</artifactId>
+    <name>Geronimo Configs :: Roller derby resources jar repackaging from tgz</name>
     <packaging>application-assembly</packaging>
 
     <dependencies>
@@ -83,16 +83,11 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
-<!--
-                        <id>bin</id>
--->
                         <phase>package</phase>
                         <goals>
                             <goal>attached</goal>
                         </goals>
                         <configuration>
-                     <webXml>${pom.basedir}/target/scratch/apache-roller-3.1/webapp/roller/WEB-INF/web.xml</webXml>
-                    <archiveClasses>false</archiveClasses>
                             <descriptors>
                                 <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
                             </descriptors>
@@ -100,21 +95,6 @@
                     </execution>
                 </executions>
             </plugin>
-<!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webXml>${pom.basedir}/target/scratch/apache-roller-3.1/webapp/roller/WEB-INF/web.xml</webXml>
-                    <archiveClasses>false</archiveClasses>
-                    <webResources>
-                        <resource>
-                             <directory>target/scratch/apache-roller-3.1/webapp/roller</directory>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
--->
        </plugins>
     </build>
 

Modified: geronimo/plugins/roller/roller-derby-resources/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-derby-resources/src/main/assembly/bin.xml?view=diff&rev=524643&r1=520214&r2=524643
==============================================================================
--- geronimo/plugins/roller/roller-derby-resources/src/main/assembly/bin.xml (original)
+++ geronimo/plugins/roller/roller-derby-resources/src/main/assembly/bin.xml Sun Apr  1 10:40:27
2007
@@ -23,7 +23,7 @@
 <assembly>
     
     <formats>
-        <format>war</format>
+        <format>jar</format>
     </formats>
 
     <includeBaseDirectory>false</includeBaseDirectory>
@@ -31,11 +31,11 @@
     <fileSets>
 
         <fileSet>
-            <directory>target/scratch/apache-roller-3.1/webapp/roller</directory>
-            <outputDirectory>/</outputDirectory>
-            <excludes>
-                <exclude>META-INF/**</exclude>
-            </excludes>
+            <directory>target/scratch/apache-roller-3.1/webapp/roller/WEB-INF/dbscripts</directory>
+            <outputDirectory>META-INF</outputDirectory>
+            <includes>
+                <include>derby/createdb.sql</include>
+	    </includes>
         </fileSet>
         <fileSet>
             <directory>target/classes</directory>
@@ -46,69 +46,10 @@
                <include>META-INF/DISCLAIMER*</include>
            </includes>
         </fileSet>
-<!--
-        
-        <fileSet>
-            <directory>target/boilerplate/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>*.sh</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0755</fileMode>
-        </fileSet>
-        
-        <fileSet>
-            <directory>target/boilerplate/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>*.bat</include>
-                <include>*.txt</include>
-            </includes>
-            <lineEnding>dos</lineEnding>
-        </fileSet>
-        
-        <fileSet>
-            <directory>target/scratch/clientcert</directory>
-            <outputDirectory>var/security/keystores</outputDirectory>
-            <includes>
-                <include>*.jks</include>
-            </includes>
-        </fileSet>
-        
-        <fileSet>
-            <directory>target/scratch/cts-database</directory>
-            <outputDirectory>var/derby</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <excludes>
-                <exclude>META-INF/**</exclude>
-            </excludes>
-        </fileSet>
--->        
         <fileSet>
             <directory>src/main/resources</directory>
             <outputDirectory>/</outputDirectory>
         </fileSet>
-<!--        
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>var/config</outputDirectory>
-            <includes>
-                <include>offline-deployer-list</include>
-            </includes>
-        </fileSet>
-        
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>var/config</outputDirectory>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>config.xml</include>
-            </includes>
-        </fileSet>
--->
     </fileSets>
 
 </assembly>

Added: geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties?view=auto&rev=524643
==============================================================================
--- geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties
(added)
+++ geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties
Sun Apr  1 10:40:27 2007
@@ -0,0 +1,12 @@
+
+uploads.dir=/var/local/roller/roller_data/uploads
+search.index.dir=/var/local/roller/roller_data/search-index
+
+#---------------------------------
+# Database configuration settings
+
+# Hibernate dialect: You must override this to use a database other than MySQL4
+hibernate.dialect=org.hibernate.dialect.DerbyDialect
+
+###
+###site.frontpage.weblog.handle=admin
\ No newline at end of file

Propchange: geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml?view=diff&rev=524643&r1=524642&r2=524643
==============================================================================
--- geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml (original)
+++ geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml Sun Apr  1 10:40:27 2007
@@ -46,69 +46,10 @@
                <include>META-INF/DISCLAIMER*</include>
            </includes>
         </fileSet>
-<!--
-        
-        <fileSet>
-            <directory>target/boilerplate/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>*.sh</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0755</fileMode>
-        </fileSet>
-        
-        <fileSet>
-            <directory>target/boilerplate/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>*.bat</include>
-                <include>*.txt</include>
-            </includes>
-            <lineEnding>dos</lineEnding>
-        </fileSet>
-        
-        <fileSet>
-            <directory>target/scratch/clientcert</directory>
-            <outputDirectory>var/security/keystores</outputDirectory>
-            <includes>
-                <include>*.jks</include>
-            </includes>
-        </fileSet>
-        
-        <fileSet>
-            <directory>target/scratch/cts-database</directory>
-            <outputDirectory>var/derby</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <excludes>
-                <exclude>META-INF/**</exclude>
-            </excludes>
-        </fileSet>
--->        
         <fileSet>
             <directory>src/main/resources</directory>
             <outputDirectory>/</outputDirectory>
         </fileSet>
-<!--        
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>var/config</outputDirectory>
-            <includes>
-                <include>offline-deployer-list</include>
-            </includes>
-        </fileSet>
-        
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>var/config</outputDirectory>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>config.xml</include>
-            </includes>
-        </fileSet>
--->
     </fileSets>
 
 </assembly>



Mime
View raw message