geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r959168 - in /geronimo/samples/branches/3.0-M1/samples: all-samples/all-samples-jetty/ all-samples/all-samples-tomcat/ daytrader/assemblies/ daytrader/assemblies/javaee/ daytrader/plugins/ daytrader/plugins/daytrader-jetty/ daytrader/plugin...
Date Wed, 30 Jun 2010 02:23:03 GMT
Author: xiaming
Date: Wed Jun 30 02:23:02 2010
New Revision: 959168

URL: http://svn.apache.org/viewvc?rev=959168&view=rev
Log:
GERONIMO-5399 remove unreleased samples

Removed:
    geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/
    geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-jetty/
    geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-jms/
    geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-tomcat/
    geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/
    geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/
    geronimo/samples/branches/3.0-M1/samples/javaee5/async-http/
    geronimo/samples/branches/3.0-M1/samples/javaee5/bank/
    geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/
    geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/
    geronimo/samples/branches/3.0-M1/samples/javaee5/customer/
    geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/
    geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/
    geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/
    geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/
    geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/
    geronimo/samples/branches/3.0-M1/samples/javaee6/ejbtimer-javaee6/
    geronimo/samples/branches/3.0-M1/samples/javaee6/jpa20demo-javaee6/
    geronimo/samples/branches/3.0-M1/samples/javaee6/restfulorder-javaee6/
    geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/
    geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/
    geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/
Modified:
    geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml
    geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml
    geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/pom.xml
    geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/pom.xml
    geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml
    geronimo/samples/branches/3.0-M1/samples/javaee6/pom.xml
    geronimo/samples/branches/3.0-M1/samples/osgi/pom.xml

Modified: geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml?rev=959168&r1=959167&r2=959168&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml Wed Jun
30 02:23:02 2010
@@ -44,28 +44,7 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
-
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>bank-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>calculator-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>customer-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
-
+        
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>dbtester-jetty</artifactId>
@@ -78,21 +57,7 @@
             <artifactId>inventory-jetty</artifactId>
             <version>${project.version}</version>
             <type>car</type>
-        </dependency>
-
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jaxws-calculator-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jms-mdb-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
+        </dependency>        
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
@@ -106,28 +71,7 @@
             <artifactId>ldap-sample-app-jetty</artifactId>
             <version>${project.version}</version>
             <type>car</type>
-        </dependency>
-
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>myphonebook-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>mytime-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
-
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>sendmail-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
+        </dependency>        
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
@@ -141,13 +85,7 @@
             <artifactId>timereport-jetty</artifactId>
             <version>${project.version}</version>
             <type>car</type>
-        </dependency>
-	    <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>DataCDInfo-JTA-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
+        </dependency>	    
 
         <!--Java EE 6 Samples Plugins-->
         <dependency>
@@ -173,37 +111,7 @@
             <artifactId>fileupload-javaee6-jetty</artifactId>
             <version>${project.version}</version>
             <type>car</type>
-        </dependency>
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>webfragment-javaee6-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jpa20demo-javaee6-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>ejbtimer-javaee6-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>singletonejb-javaee6-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>restfulorder-javaee6-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->        
+        </dependency>       
 
         <!--Daytrader-->
         <dependency>
@@ -226,13 +134,7 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
-
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
-            <artifactId>daytrader-jetty</artifactId>            
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
+        
         <!-- OSGi -->
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml?rev=959168&r1=959167&r2=959168&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml Wed Jun
30 02:23:02 2010
@@ -44,35 +44,7 @@
             <artifactId>sample-datasource</artifactId>
             <version>${project.version}</version>
             <type>car</type>
-        </dependency>
-
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>app-per-port-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
-
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>bank-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>calculator-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>customer-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
+        </dependency>        
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
@@ -86,21 +58,7 @@
             <artifactId>inventory-tomcat</artifactId>
             <version>${project.version}</version>
             <type>car</type>
-        </dependency>
-
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jaxws-calculator-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jms-mdb-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
+        </dependency>        
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
@@ -114,28 +72,7 @@
             <artifactId>ldap-sample-app-tomcat</artifactId>
             <version>${project.version}</version>
             <type>car</type>
-        </dependency>
-
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>myphonebook-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>mytime-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
-
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>sendmail-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
+        </dependency>        
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
@@ -150,12 +87,7 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
-	    <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>DataCDInfo-JTA-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
+	    
         <!--Java EE 6 Samples Plugins-->
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
@@ -180,37 +112,7 @@
             <artifactId>fileupload-javaee6-tomcat</artifactId>
             <version>${project.version}</version>
             <type>car</type>
-        </dependency>
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>webfragment-javaee6-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jpa20demo-javaee6-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>ejbtimer-javaee6-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>singletonejb-javaee6-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>restfulorder-javaee6-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->      
+        </dependency>            
 
         <!--Daytrader-->
         <dependency>
@@ -233,13 +135,7 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
-
-        <!--<dependency>
-            <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
-            <artifactId>daytrader-tomcat</artifactId>            
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>-->
+        
         <!-- OSGi -->
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/pom.xml?rev=959168&r1=959167&r2=959168&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/pom.xml Wed Jun 30 02:23:02
2010
@@ -29,26 +29,7 @@
     <artifactId>assemblies</artifactId>
     <name>DayTrader :: Assemblies</name>
     <packaging>pom</packaging>
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <!--<module>javaee</module>-->
-                <module>web</module>     
-            </modules>
-        </profile>
-        <profile>
-            <id>all-subprojects</id>            
-            
-            <modules>
-                <module>javaee</module>
-                <module>web</module>     
-            </modules>
-        </profile>    
-    </profiles>
-    
-
+    <modules>
+        <module>web</module>     
+    </modules>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/pom.xml?rev=959168&r1=959167&r2=959168&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/pom.xml Wed Jun 30 02:23:02
2010
@@ -30,75 +30,42 @@
     <name>DayTrader :: Plugins</name>
     <packaging>pom</packaging>
 
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>default</name>
-                </property>
-            </activation>
-            <modules>
-                <module>daytrader-derby-datasource</module>
-        	    <module>daytrader-web-jdbc-jetty</module>
-                <module>daytrader-web-jdbc-tomcat</module>
-        	    <module>daytrader-web-jpa-jetty</module>
-                <module>daytrader-web-jpa-tomcat</module>
-                <!--<module>daytrader-jms</module>
-                <module>daytrader-jetty</module>
-                <module>daytrader-tomcat</module>-->
-            </modules>
-        </profile>
-        <!--
+    <modules>
+        <module>daytrader-derby-datasource</module>
+        <module>daytrader-web-jdbc-jetty</module>
+        <module>daytrader-web-jdbc-tomcat</module>
+        <module>daytrader-web-jpa-jetty</module>
+        <module>daytrader-web-jpa-tomcat</module>
+        <!--<module>daytrader-db2-datasource</module>
+        <module>daytrader-oracle-datasource</module>
+        <module>daytrader-mysql-datasource</module>
+        <module>daytrader-informix-datasource</module>
+        <module>daytrader-sqlserver-datasource</module>
+        <module>daytrader-postgre-datasource</module>-->        	    
+    </modules>
+    <properties>
+        <maven.repo.drivers>http://not.a.real.repository</maven.repo.drivers>
+    </properties>
+            <!--
             You can build the extra datasources in this profile if you have
             the required JDBC artifacts from each DB vendor installed into
             either your local repo or a private maven repo you have setup,
             by supplying the URL on the mvn cmdline as:
                 -Dmaven.repo.drivers=http://my.local.repo
-        -->
-        <profile>
-            <id>all-subprojects</id>
-            <activation>
-                <property>
-                    <name>all</name>
-                </property>
-            </activation>
-            <modules>
-                <module>daytrader-derby-datasource</module>
-                <module>daytrader-web-jdbc-jetty</module>
-                <module>daytrader-web-jdbc-tomcat</module>
-        	    <module>daytrader-web-jpa-jetty</module>
-                <module>daytrader-web-jpa-tomcat</module>
-                <module>daytrader-jms</module>
-                <module>daytrader-jetty</module>
-                <module>daytrader-tomcat</module>
-                <module>daytrader-db2-datasource</module>
-                <module>daytrader-oracle-datasource</module>
-        	    <module>daytrader-mysql-datasource</module>
-                <module>daytrader-informix-datasource</module>
-        	    <module>daytrader-sqlserver-datasource</module>
-                <module>daytrader-postgre-datasource</module>        	    
-            </modules>
-            <properties>
-                <maven.repo.drivers>http://not.a.real.repository</maven.repo.drivers>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>maven.repo.drivers</id>
-                    <name>Private JDBC Driver Repository</name>
-                    <url>${maven.repo.drivers}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-    </profiles>
-    
+            -->
+     <repositories>
+        <repository>
+           <id>maven.repo.drivers</id>
+           <name>Private JDBC Driver Repository</name>
+           <url>${maven.repo.drivers}</url>
+           <layout>default</layout>
+           <snapshots>
+              <enabled>false</enabled>
+           </snapshots>
+           <releases>
+              <enabled>true</enabled>
+              <checksumPolicy>ignore</checksumPolicy>
+           </releases>
+        </repository>
+    </repositories>    
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml?rev=959168&r1=959167&r2=959168&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml Wed Jun 30 02:23:02 2010
@@ -85,86 +85,12 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>                
-                <!--<module>customer</module>-->
-                <!--<module>async-http</module>-->
-                <!--<module>bank</module>-->
-                <!--<module>calculator</module>-->
-                <module>dbtester</module>
-                <module>inventory</module>
-                <!--<module>jaxws-calculator</module>-->
-                <!--<module>jms-mdb</module>-->
-                <module>ldap-sample-app</module>
-                <!--<module>myphonebook</module>-->
-                <!--<module>mytime</module>-->
-                <!--<module>sendmail</module>-->
-                <module>timereport</module>
-                <module>jsp-examples</module>
-                <module>servlet-examples</module>
-                <!--<module>app-per-port</module>-->
-	            <!--<module>csa-activemq</module>-->
-                <!--<module>DataCDInfo</module>-->
-            </modules>
-        </profile>
-        <profile>
-            <id>no-plugin</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>        
-                <property>
-                    <name>buildPlugin</name>
-                    <value>false</value>
-                </property>        
-            </activation>
-            <modules>                
-                <module>customer</module>
-                <!--<module>async-http</module>-->
-                <module>bank</module>
-                <module>calculator</module>
-                <module>dbtester</module>
-                <module>inventory</module>
-                <module>jaxws-calculator</module>
-                <module>jms-mdb</module>
-                <module>ldap-sample-app</module>
-                <module>myphonebook</module>
-                <module>mytime</module>
-                <module>sendmail</module>
-                <module>timereport</module>
-                <module>jsp-examples</module>
-                <module>servlet-examples</module>
-                <module>app-per-port</module>	            
-                <module>DataCDInfo</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>all-subprojects</id>
-            
-            <modules>
-                <module>customer</module>
-                <module>async-http</module>
-                <module>bank</module>
-                <module>calculator</module>
-                <module>dbtester</module>
-                <module>inventory</module>
-                <module>jaxws-calculator</module>
-                <module>jms-mdb</module>
-                <module>ldap-sample-app</module>
-                <module>myphonebook</module>
-                <module>mytime</module>
-                <module>sendmail</module>
-                <module>timereport</module>
-                <module>jsp-examples</module>
-                <module>servlet-examples</module>
-                <module>app-per-port</module>
-	            <module>csa-activemq</module>
-                <module>DataCDInfo</module>
-            </modules>
-        </profile>
-    </profiles>    
+    <modules>
+        <module>dbtester</module>
+        <module>inventory</module>
+        <module>ldap-sample-app</module>
+        <module>timereport</module>
+        <module>jsp-examples</module>
+        <module>servlet-examples</module>
+    </modules>    
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee6/pom.xml?rev=959168&r1=959167&r2=959168&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee6/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee6/pom.xml Wed Jun 30 02:23:02 2010
@@ -82,6 +82,13 @@
             </plugin>
         </plugins>
     </build>
+    
+    <modules>				
+        <module>cviewer-javaee6</module>
+        <module>converter-javaee6</module>
+        <module>jarresource-javaee6</module>
+        <module>fileupload-javaee6</module>
+    </modules>
 
     <profiles>
         <!-- This profile creates a sample template.
@@ -130,62 +137,6 @@
                     </plugin>
                 </plugins>
             </build>
-        </profile>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>				
-                <!--Servlet 3.0 and JSF samples-->
-                <module>cviewer-javaee6</module>
-                <module>converter-javaee6</module>
-                <module>jarresource-javaee6</module>
-                <module>fileupload-javaee6</module>
-                <!--<module>webfragment-javaee6</module>-->
-                <!--EJB 3.1 and JPA 2.0 samples, not work for 3.0-M1 yet-->
-                <!--<module>jpa20demo-javaee6</module>     
-                <module>ejbtimer-javaee6</module>                
-                <module>singletonejb-javaee6</module>
-                <module>restfulorder-javaee6</module>-->
-            </modules>
-        </profile>
-        <profile>
-            <id>no-plugin</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>        
-                <property>
-                    <name>buildPlugin</name>
-                    <value>false</value>
-                </property>        
-            </activation>
-            <modules>
-                <!--Servlet 3.0 and JSF samples-->
-                <module>cviewer-javaee6</module>
-                <module>converter-javaee6</module>
-                <module>jarresource-javaee6</module>
-                <module>fileupload-javaee6</module>
-                <!--<module>webfragment-javaee6</module>-->
-                <!--EJB 3.1 and JPA 2.0 samples, not work for 3.0-M1 yet-->
-                <!--<module>jpa20demo-javaee6</module>     
-                <module>ejbtimer-javaee6</module>                
-                <module>singletonejb-javaee6</module>
-                <module>restfulorder-javaee6</module>-->
-            </modules>
-        </profile>
-        <profile>
-            <id>all-subprojects</id>            
-            <modules>                
-                <module>cviewer-javaee6</module>
-                <module>converter-javaee6</module>
-                <module>jarresource-javaee6</module>
-                <module>fileupload-javaee6</module>
-                <module>webfragment-javaee6</module>                
-                <module>jpa20demo-javaee6</module>     
-                <module>ejbtimer-javaee6</module>                
-                <module>singletonejb-javaee6</module>
-                <module>restfulorder-javaee6</module>
-            </modules>
-        </profile>
+        </profile>        
     </profiles>  
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/osgi/pom.xml?rev=959168&r1=959167&r2=959168&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/osgi/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/osgi/pom.xml Wed Jun 30 02:23:02 2010
@@ -37,26 +37,9 @@
         <ariesVersion>0.1-incubating</ariesVersion>        
     </properties>
 
-    
-    <dependencies>
-        <!-- Not clear about the dependencies for now 
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.2_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>-->
-
-    </dependencies>
+    <modules>
+        <module>aries-datasource</module>
+    </modules>    
 
     <build>
         <resources>
@@ -77,60 +60,6 @@
                 </configuration>
             </plugin>
             </plugins>
-        </pluginManagement>
-
-        <plugins>     
-            <!--<plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>              
-            </plugin>       
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>                
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ear-plugin</artifactId>                
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>              
-            </plugin>-->
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>aries-datasource</module>
-                <!--<module>ariestrader-jdbc</module>-->
-            </modules>
-        </profile>
-        <profile>
-            <id>no-plugin</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>        
-                <property>
-                    <name>buildPlugin</name>
-                    <value>false</value>
-                </property>        
-            </activation>
-            <modules>                
-            </modules>
-        </profile>
-        <profile>
-            <id>all-subprojects</id>
-            
-            <modules>
-                <module>aries-datasource</module>
-                <module>ariestrader-jdbc</module>
-            </modules>
-        </profile>
-    </profiles>   
+        </pluginManagement>        
+    </build>    
 </project>



Mime
View raw message