You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/11/05 15:13:46 UTC
svn commit: r1197963 - in /geronimo/samples/trunk/samples:
all-samples/all-samples-jetty/ all-samples/all-samples-tomcat/
javaee6/converter-javaee6/converter-javaee6-war/
javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/
javaee6/jpa20demo-javaee6/jpa2...
Author: violalu
Date: Sat Nov 5 14:13:45 2011
New Revision: 1197963
URL: http://svn.apache.org/viewvc?rev=1197963&view=rev
Log:
update samples
Modified:
geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml
geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/pom.xml
geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml
geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml
geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/pom.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/pom.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/pom.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/pom.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/pom.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/pom.xml
Modified: geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml Sat Nov 5 14:13:45 2011
@@ -198,12 +198,12 @@
<version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>restfulorder-javaee6-jetty</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency> -->
<!--Daytrader
<dependency>
@@ -233,13 +233,13 @@
<version>${project.version}</version>
<type>car</type>
</dependency>-->
- <!-- OSGi -->
+ <!-- OSGi
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>aries-datasource</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
</dependencies>
<build>
Modified: geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml Sat Nov 5 14:13:45 2011
@@ -205,12 +205,12 @@
<version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>restfulorder-javaee6-tomcat</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency> -->
<!--Daytrader
<dependency>
@@ -240,13 +240,13 @@
<version>${project.version}</version>
<type>car</type>
</dependency>-->
- <!-- OSGi -->
+ <!-- OSGi
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>aries-datasource</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
</dependencies>
<build>
Modified: geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/pom.xml Sat Nov 5 14:13:45 2011
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>myfaces-bundle</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml Sat Nov 5 14:13:45 2011
@@ -44,9 +44,9 @@
<type>war</type>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>myfaces-bundle</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml Sat Nov 5 14:13:45 2011
@@ -38,8 +38,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>myfaces-bundle</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml Sat Nov 5 14:13:45 2011
@@ -45,9 +45,9 @@
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>myfaces-bundle</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/pom.xml Sat Nov 5 14:13:45 2011
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
- <name>Apache Aries Blueprint HelloWorld API</name>
+ <name>Geronimo Samples :: EBA Sample:: HelloWorld API</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world application - api</description>
Modified: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/pom.xml Sat Nov 5 14:13:45 2011
@@ -24,7 +24,7 @@
</parent>
<artifactId>org.apache.aries.samples.blueprint.helloworld.assembly</artifactId>
- <name>Apache Aries Blueprint HelloWorld Assembly</name>
+ <name>Geronimo Samples :: EBA Sample:: HelloWorld Assembly</name>
<packaging>eba</packaging>
<dependencies>
Modified: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/pom.xml Sat Nov 5 14:13:45 2011
@@ -23,7 +23,7 @@
</parent>
<artifactId>org.apache.aries.samples.blueprint.helloworld.client</artifactId>
- <name>Apache Aries Blueprint HelloWorldClient</name>
+ <name>Geronimo Samples :: EBA Sample:: HelloWorldClient</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world client application.</description>
Modified: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/pom.xml Sat Nov 5 14:13:45 2011
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.aries.samples.blueprint.helloworld.server</artifactId>
- <name>Apache Aries Blueprint HelloWorldServer</name>
+ <name>Geronimo Samples :: EBA Sample:: HelloWorldServer</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world application - server</description>
Modified: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/pom.xml Sat Nov 5 14:13:45 2011
@@ -23,7 +23,7 @@
</parent>
<artifactId>org.apache.aries.samples.blueprint.helloworld.wab</artifactId>
- <name>Apache Aries Blueprint HelloWorld WAB</name>
+ <name>Geronimo Samples :: EBA Sample:: HelloWorld WAB</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world client application.</description>
Modified: geronimo/samples/trunk/samples/osgi/helloworld-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/pom.xml?rev=1197963&r1=1197962&r2=1197963&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/pom.xml Sat Nov 5 14:13:45 2011
@@ -25,7 +25,7 @@
</parent>
<artifactId>org.apache.geronimo.samples.osgi.helloworld.eba</artifactId>
- <name>Apache Aries Blueprint HelloWorld</name>
+ <name>Geronimo Samples :: EBA Sample:: HelloWorld EBA</name>
<packaging>pom</packaging>
<description>Example blueprint hello world application</description>