geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r520214 - in /geronimo/plugins/roller: ./ derby/ derby/src/main/ derby/src/main/resources/ derby/src/main/resources/META-INF/ derby/src/plan/ roller-jetty/ roller-jetty/src/main/resources/META-INF/ roller-jetty/src/plan/ roller-war/ roller-...
Date Tue, 20 Mar 2007 02:01:03 GMT
Author: djencks
Date: Mon Mar 19 19:01:00 2007
New Revision: 520214

URL: http://svn.apache.org/viewvc?view=rev&rev=520214
Log:
GERONIMO-2994.  A start at setting up modules to build roller plugins, based on the derby
db and roller plans supplied by Peter Petersson

Added:
    geronimo/plugins/roller/
    geronimo/plugins/roller/derby/
      - copied from r518964, geronimo/server/trunk/configs/system-database/
    geronimo/plugins/roller/derby/src/main/
    geronimo/plugins/roller/derby/src/main/resources/
    geronimo/plugins/roller/derby/src/main/resources/META-INF/
    geronimo/plugins/roller/derby/src/main/resources/META-INF/geronimo-plugin.xml   (with
props)
    geronimo/plugins/roller/roller-jetty/
      - copied from r518964, geronimo/server/trunk/configs/welcome-jetty/
    geronimo/plugins/roller/roller-war/
    geronimo/plugins/roller/roller-war/pom.xml   (with props)
    geronimo/plugins/roller/roller-war/src/
    geronimo/plugins/roller/roller-war/src/main/
    geronimo/plugins/roller/roller-war/src/main/assembly/
    geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml   (with props)
    geronimo/plugins/roller/roller-war/src/main/resources/
Modified:
    geronimo/plugins/roller/derby/pom.xml
    geronimo/plugins/roller/derby/src/plan/plan.xml
    geronimo/plugins/roller/roller-jetty/pom.xml
    geronimo/plugins/roller/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/roller/roller-jetty/src/plan/plan.xml

Modified: geronimo/plugins/roller/derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/derby/pom.xml?view=diff&rev=520214&r1=518964&r2=520214
==============================================================================
--- geronimo/plugins/roller/derby/pom.xml (original)
+++ geronimo/plugins/roller/derby/pom.xml Mon Mar 19 19:01:00 2007
@@ -26,59 +26,23 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <artifactId>system-database</artifactId>
-    <name>Geronimo Configs :: System Database</name>
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>roller-derby-database</artifactId>
+    <name>Geronimo Plugins :: Roller Derby Database</name>
     <packaging>car</packaging>
     
     <dependencies>
-                
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
+            <artifactId>system-database</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-derby</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-timer</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbyclient</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <artifactId>tranql-connector-derby-embed-local</artifactId>
             <type>rar</type>
         </dependency>
         
@@ -104,7 +68,7 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.tranql</groupId>
-                        <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                        <artifactId>tranql-connector-derby-embed-local</artifactId>
                         <type>rar</type>
                     </module>
                 </configuration>

Added: geronimo/plugins/roller/derby/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/derby/src/main/resources/META-INF/geronimo-plugin.xml?view=auto&rev=520214
==============================================================================
--- geronimo/plugins/roller/derby/src/main/resources/META-INF/geronimo-plugin.xml (added)
+++ geronimo/plugins/roller/derby/src/main/resources/META-INF/geronimo-plugin.xml Mon Mar
19 19:01:00 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+    <name>Roller derby db</name>
+    <module-id>org.apache.geronimo.plugins/roller-derby-database/2.0-SNAPSHOT/car</module-id>
+    <category>Application</category>
+    <description>
+derby db for roller
+</description>
+
+    <url>http://geronimo.apache.org/</url>
+    <author>The Apache Geronimo development community</author>
+    <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+    <geronimo-version>2.0-SNAPSHOT</geronimo-version>
+
+    <dependency>org.apache.geronimo.configs/system-database//car</dependency>
+</geronimo-plugin>

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

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

Propchange: geronimo/plugins/roller/derby/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

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=520214&r1=518964&r2=520214
==============================================================================
--- geronimo/plugins/roller/derby/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/derby/src/plan/plan.xml Mon Mar 19 19:01:00 2007
@@ -18,76 +18,26 @@
 
 <!-- $Rev$ $Date$ -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
-
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
     <resourceadapter>
         <outbound-resourceadapter>
             <connection-definition>
                 <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
                 <connectiondefinition-instance>
-                    <name>SystemDatasource</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
-                    <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <name>jdbc/rollerdb</name>
+                    <config-property-setting name="Password">roller</config-property-setting>
+                    <config-property-setting name="UserName">roller</config-property-setting>
+                    <config-property-setting name="DatabaseName">roller</config-property-setting>
                     <connectionmanager>
-                        <xa-transaction>
-                            <transaction-caching/>
-                        </xa-transaction>
+                        <local-transaction/>
                         <single-pool>
-                            <max-size>100</max-size>
-                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                            <select-one-assume-match/>
-                        </single-pool>
-                    </connectionmanager>
-                </connectiondefinition-instance>
-                <connectiondefinition-instance>
-                    <name>NoTxDatasource</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
-                    <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
-                    <connectionmanager>
-                        <no-transaction/>
-                        <single-pool>
-                            <max-size>100</max-size>
-                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                            <select-one-assume-match/>
+                            <max-size>10</max-size>
+                            <min-size>0</min-size>
+                            <match-one/>
                         </single-pool>
                     </connectionmanager>
                 </connectiondefinition-instance>
             </connection-definition>
         </outbound-resourceadapter>
     </resourceadapter>
-
-    <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
-        <reference name="ServerInfo"><name>ServerInfo</name></reference>
-        <attribute name="derbySystemHome">var/derby</attribute>
-    </gbean>
-    
-    <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
-        <reference name="derbySystem"><name>DerbySystem</name></reference>
-        <attribute name="host">localhost</attribute>
-        <attribute name="port">1527</attribute>
-    </gbean>
-    
-    <gbean name="DerbyLog" class="org.apache.geronimo.derby.DerbyLogGBean">
-        <reference name="DerbySystem"><name>DerbySystem</name></reference>
-    </gbean>
-
-    <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
-        <attribute name="repeatCount">5</attribute>
-        <reference name="TransactionManager"><name>TransactionManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
-        <dependency><name>DerbySystem</name></dependency>
-    </gbean>
-
-    <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-        <reference name="TransactionManager"><name>TransactionManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
-        <dependency><name>DerbySystem</name></dependency>
-    </gbean>
-
 </connector>

Modified: geronimo/plugins/roller/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-jetty/pom.xml?view=diff&rev=520214&r1=518964&r2=520214
==============================================================================
--- geronimo/plugins/roller/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/roller-jetty/pom.xml Mon Mar 19 19:01:00 2007
@@ -26,11 +26,10 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>welcome-jetty</artifactId>
-    <name>Geronimo Configs :: Welcome app Jetty</name>
+    <artifactId>roller-jetty</artifactId>
+    <name>Geronimo Plugins :: Roller for Jetty</name>
     <packaging>car</packaging>
     
     <dependencies>
@@ -44,12 +43,38 @@
         <!--</dependency>-->
 
         <dependency>
-            <groupId>org.apache.geronimo.applications</groupId>
-            <artifactId>geronimo-welcome</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>geronimo-roller-war</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>roller-derby-database</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>   
+
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
+        </dependency>   
+
+        <dependency>
+            <groupId>ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>1.1</version>
+        </dependency>   
+
+        <dependency>
+            <groupId>hibernate</groupId>
+            <artifactId>hibernate</artifactId>
+            <version>3.0.5</version>
+        </dependency>   
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-deployer</artifactId>
@@ -78,10 +103,10 @@
                         <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-                        <groupId>org.apache.geronimo.applications</groupId>
-                        <artifactId>geronimo-welcome</artifactId>
-                        <version>${version}</version>
-                        <type>war</type>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>geronimo-roller-war</artifactId>
+            <version>${version}</version>
+                       <type>war</type>
                     </module>
                 </configuration>
             </plugin>

Modified: geronimo/plugins/roller/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=520214&r1=518964&r2=520214
==============================================================================
--- geronimo/plugins/roller/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/roller/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon
Mar 19 19:01:00 2007
@@ -19,32 +19,30 @@
 <!-- $Rev$ $Date$ -->
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-    <name>Geronimo Welcome Web App (Jetty)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
-    <category>Core Geronimo</category>
+    <name>Roller on jetty</name>
+    <module-id>org.apache.geronimo.plugins/roller-jetty/2.0-SNAPSHOT/car</module-id>
+    <category>Application</category>
     <description>
-        The welcome application for Geronimo.  This binds to / so it
-        handles all requests that nothing else is bound to.  The main
-        purpose is to greet users who are exploring Geronimo for the
-        first time.  It should typically be removed or replaced for
-        production applications.
-    </description>
+roller on jetty
+</description>
+
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${version}</geronimo-version>
+    <geronimo-version>2.0-SNAPSHOT</geronimo-version>
+
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>
         <description>
-            This version of the Welcome application works with the Geronimo/Jetty distribution.
+            This version of the Roller application works with the Geronimo/Jetty distribution.
             It is not intended to run in the Geronimo/Tomcat distribution.
-            There is a separate version of the Welcome application that works with Tomcat.
+            There is a separate version of the Roller application that works with Tomcat.
             Please install the version appropriate to your Geronimo distribution.
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
-    <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
-    <source-repository>http://www.ibiblio.org/maven2/</source-repository>
+    <dependency>org.apache.geronimo.plugins/roller-derby-database//car</dependency>
+<!--    <dependency>dom4j/dom4j/1.6.1/jar</dependency> 
+-->
 </geronimo-plugin>

Modified: geronimo/plugins/roller/roller-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-jetty/src/plan/plan.xml?view=diff&rev=520214&r1=518964&r2=520214
==============================================================================
--- geronimo/plugins/roller/roller-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/roller-jetty/src/plan/plan.xml Mon Mar 19 19:01:00 2007
@@ -20,6 +20,28 @@
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
 
-    <context-root>/</context-root>
+  <context-root>/roller</context-root>
+    
+    <gbean name="roller" class="org.apache.geronimo.security.realm.GenericSecurityRealm"
xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <attribute name="realmName">roller</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="LoginService">
+            <name>JaasLoginService</name>
+        </reference>
+        <xml-reference name="LoginModuleConfiguration">
+            <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
+                <log:login-module control-flag="REQUIRED" server-side="true" wrap-principals="false">
+                    <log:login-domain-name>roller</log:login-domain-name>
+                    <log:login-module-class>org.apache.geronimo.security.realm.providers.SQLLoginModule</log:login-module-class>
+                    <log:option name="userSelect">SELECT username, passphrase FROM
rolleruser WHERE username=?</log:option>
+                    <log:option name="dataSourceApplication">null</log:option>
+                    <log:option name="groupSelect">SELECT username, rolename FROM userrole
WHERE username=?</log:option>
+                    <log:option name="dataSourceName">jdbc/rollerdb</log:option>
+                </log:login-module>
+            </log:login-config>
+        </xml-reference>
+    </gbean>
     
 </web-app>

Added: geronimo/plugins/roller/roller-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-war/pom.xml?view=auto&rev=520214
==============================================================================
--- geronimo/plugins/roller/roller-war/pom.xml (added)
+++ geronimo/plugins/roller/roller-war/pom.xml Mon Mar 19 19:01:00 2007
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>geronimo-roller-war</artifactId>
+    <name>Geronimo Configs :: Roller war repackaging from tgz</name>
+    <packaging>application-assembly</packaging>
+
+    <dependencies>
+<!--
+        <dependency>
+            <groupId>org.apache.roller</groupId>
+            <artifactId>roller</artifactId>
+            <version>3.1-rc6</version>
+            <classifier>bin</classifier>
+            <type>zip</type>
+        </dependency>
+-->
+
+    </dependencies>
+
+    <build>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+
+                    <execution>
+                        <id>unpack-distribution</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.roller</groupId>
+                                    <artifactId>roller</artifactId>
+                                    <type>zip</type>
+                                    <version>3.1-rc6</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/scratch</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <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>
+                        </configuration>
+                    </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>
+
+
+</project>

Propchange: geronimo/plugins/roller/roller-war/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/roller/roller-war/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/roller/roller-war/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: 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=auto&rev=520214
==============================================================================
--- geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml (added)
+++ geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml Mon Mar 19 19:01:00 2007
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<assembly>
+    
+    <formats>
+        <format>war</format>
+    </formats>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+
+        <fileSet>
+            <directory>target/scratch/apache-roller-3.1/webapp/roller</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>META-INF/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+               <include>META-INF/LICENSE*</include>
+               <include>META-INF/NOTICE*</include>
+               <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>

Propchange: geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message