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/04 05:38:25 UTC
svn commit: r1197401 - in /geronimo/samples/trunk: ./
samples/javaee5/async-http/http-remote-app/src/main/webapp/ samples/javaee6/
samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/
samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-...
Author: violalu
Date: Fri Nov 4 04:38:25 2011
New Revision: 1197401
URL: http://svn.apache.org/viewvc?rev=1197401&view=rev
Log:
Disable restful sample coz of function missing in server, update readme.txt
Modified:
geronimo/samples/trunk/pom.xml
geronimo/samples/trunk/samples/javaee5/async-http/http-remote-app/src/main/webapp/topleft_logo_437x64.gif
geronimo/samples/trunk/samples/javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/restfulorder/service/RestfulorderResource.java
geronimo/samples/trunk/samples/osgi/pom.xml
geronimo/samples/trunk/samples/osgi/showmethemoney/readme.txt
Modified: geronimo/samples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=1197401&r1=1197400&r2=1197401&view=diff
==============================================================================
--- geronimo/samples/trunk/pom.xml (original)
+++ geronimo/samples/trunk/pom.xml Fri Nov 4 04:38:25 2011
@@ -51,7 +51,7 @@
<projectName>Apache Geronimo Samples</projectName>
<jetty>jetty8</jetty>
<tomcat>tomcat7</tomcat>
- <myfacesVersion>2.0.3</myfacesVersion>
+ <myfacesVersion>2.0.9_1</myfacesVersion>
<derbyVersion>10.6.1.0_1</derbyVersion>
</properties>
Modified: geronimo/samples/trunk/samples/javaee5/async-http/http-remote-app/src/main/webapp/topleft_logo_437x64.gif
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/async-http/http-remote-app/src/main/webapp/topleft_logo_437x64.gif?rev=1197401&r1=1197400&r2=1197401&view=diff
==============================================================================
Binary files - no diff available.
Modified: geronimo/samples/trunk/samples/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/pom.xml?rev=1197401&r1=1197400&r2=1197401&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/pom.xml Fri Nov 4 04:38:25 2011
@@ -146,7 +146,7 @@
<module>jpa20demo-javaee6</module>
<module>ejbtimer-javaee6</module>
<module>singletonejb-javaee6</module>
- <module>restfulorder-javaee6</module>
+ <!--<module>restfulorder-javaee6</module>-->
</modules>
</profile>
<profile>
Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml?rev=1197401&r1=1197400&r2=1197401&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml Fri Nov 4 04:38:25 2011
@@ -36,7 +36,7 @@
<description>Geronimo Samples. WEB Module</description>
- <!--<dependencyManagement>
+ <dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
@@ -47,14 +47,14 @@
</dependency>
</dependencies>
- </dependencyManagement>-->
+ </dependencyManagement>
<dependencies>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
+ <artifactId>myfaces-bundle</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/restfulorder/service/RestfulorderResource.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/restfulorder/service/RestfulorderResource.java?rev=1197401&r1=1197400&r2=1197401&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/restfulorder/service/RestfulorderResource.java (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/restfulorder/service/RestfulorderResource.java Fri Nov 4 04:38:25 2011
@@ -20,6 +20,7 @@ package org.apache.geronimo.samples.java
import javax.ws.rs.GET;
import javax.ws.rs.PUT;
import javax.ws.rs.DELETE;
+import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.Consumes;
import javax.ws.rs.QueryParam;
Modified: geronimo/samples/trunk/samples/osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/pom.xml?rev=1197401&r1=1197400&r2=1197401&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/pom.xml Fri Nov 4 04:38:25 2011
@@ -105,7 +105,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>aries-datasource</module>
+ <!--<module>aries-datasource</module>-->
<module>showmethemoney</module>
<module>wab-sample</module>
<module>helloworld-eba</module>
Modified: geronimo/samples/trunk/samples/osgi/showmethemoney/readme.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/showmethemoney/readme.txt?rev=1197401&r1=1197400&r2=1197401&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/showmethemoney/readme.txt (original)
+++ geronimo/samples/trunk/samples/osgi/showmethemoney/readme.txt Fri Nov 4 04:38:25 2011
@@ -26,14 +26,14 @@ INSTALL
cd %Geronimo_HOME%/bin
geronimo.bat run
2. Install Bundles. Press "enter", you can go into karaf command mode
- geronimo>install file:/D:/samplesTrunk/samples/osgi/showmethemoney/showmethemoney-api/target/showmethemoney-api-3.0-SNAPSHOT.jar
- geronimo>install file:/D:/samplesTrunk/samples/osgi/showmethemoney/showmethemoney-server/target/showmethemoney-server-3.0-SNAPSHOT.jar
- geronimo>install file:/D:/samplesTrunk/samples/osgi/showmethemoney/showmethemoney-ds/target/showmethemoney-ds-3.0-SNAPSHOT.jar
+ geronimo>install file:/[your sample home]/samples/osgi/showmethemoney/showmethemoney-api/target/showmethemoney-api-3.0-SNAPSHOT.jar
+ geronimo>install file:/[your sample home]/samples/osgi/showmethemoney/showmethemoney-server/target/showmethemoney-server-3.0-SNAPSHOT.jar
+ geronimo>install file:/[your sample home]/samples/osgi/showmethemoney/showmethemoney-ds/target/showmethemoney-ds-3.0-SNAPSHOT.jar
3. Deploy web app using deployer tool.
cd %Geronimo_Home%/bin
- deploy.[bat|sh] deploy D:/samplesTrunk/samples/osgi/showmethemoney/showmethemoney-web/showmethemoney-web-3.0-SNAPSHOT.war
+ deploy.[bat|sh] deploy [your sample home]/samples/osgi/showmethemoney/showmethemoney-web/showmethemoney-web-3.0-SNAPSHOT.war
Access http://[IP_Address]:8080/showmoney/
\ No newline at end of file