You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/11/22 06:26:32 UTC
svn commit: r1037606 - in /geronimo/samples/branches/2.1: ./
geronimo-samples-archetype/
geronimo-samples-archetype/src/main/resources/archetype-resources/
samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/
samples/DataCDInfo/DataCDInfo-JTA-war/sr...
Author: xiaming
Date: Mon Nov 22 05:26:31 2010
New Revision: 1037606
URL: http://svn.apache.org/viewvc?rev=1037606&view=rev
Log:
GERONIMO-5710 initial change to make 2.1 branch build again
Modified:
geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml
geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
geronimo/samples/branches/2.1/pom.xml
geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java
geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/pom.xml
geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml
geronimo/samples/branches/2.1/samples/jms-mdb/pom.xml
geronimo/samples/branches/2.1/samples/sample-datasource/src/main/plan/plan.xml
Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml?rev=1037606&r1=1037605&r2=1037606&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml Mon Nov 22 05:26:31 2010
@@ -33,9 +33,9 @@
<artifactId>geronimo-samples-archetype</artifactId>
<name>Geronimo Samples :: Archetype</name>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
- <description> Plugin to help create a samples project</description>
+ <description>Plugin to help create a samples project</description>
</project>
Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml?rev=1037606&r1=1037605&r2=1037606&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml Mon Nov 22 05:26:31 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3</version>
</parent>
<artifactId>${artifactId}</artifactId>
Modified: geronimo/samples/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/pom.xml?rev=1037606&r1=1037605&r2=1037606&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/pom.xml (original)
+++ geronimo/samples/branches/2.1/pom.xml Mon Nov 22 05:26:31 2010
@@ -24,10 +24,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>project-config</artifactId>
- <version>1.5</version>
- </parent>
+ <groupId>org.apache.geronimo.genesis</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0</version>
+ </parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>samples-parent</artifactId>
@@ -46,7 +46,7 @@
</scm>
<properties>
- <geronimoVersion>2.1.7-SNAPSHOT</geronimoVersion>
+ <geronimoVersion>2.1.7</geronimoVersion>
<siteId>geronimo-samples</siteId>
<projectName>Apache Geronimo Samples</projectName>
</properties>
@@ -59,33 +59,30 @@
</site>
</distributionManagement>
- <repositories>
- <!--
- NOTE: The default repositories are picked up by Genesis, but need to
- specify where Genesis lives to pickup snapshot versions.
+ <!-- G 2.1.7 Stage repo-->
+ <!--<repositories>
+
<repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <id>geronimo-server-stage</id>
+ <name>Apache Geronimo Server Stage Repository</name>
+ <url>https://repository.apache.org/content/repositories/orgapachegeronimo-015/</url>
<layout>default</layout>
<snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
+ <enabled>false</enabled>
</snapshots>
<releases>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</releases>
</repository>
- -->
- <!--
- NOTE: The following shows how to point to a locally installed
- Geronimo Server for using artifacts already on a machine
- instead of downloading them from remote repositories.
- <repository>
- <id>geronimo-server</id>
- <name>Local Apache Geronimo Server Repository</name>
- <url>file://~/geronimo-tomcat6-javaee5-2.1.2/repository</url>
+
+ </repositories>
+
+ <pluginRepositories>
+
+ <pluginRepository>
+ <id>geronimo-server-stage-plugin-repo</id>
+ <name>Apache Geronimo Server Stage Repository</name>
+ <url>https://repository.apache.org/content/repositories/orgapachegeronimo-015/</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>
@@ -93,9 +90,9 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
- -->
- </repositories>
+ </pluginRepository>
+
+ </pluginRepositories>-->
<modules>
<module>buildutil</module>
Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml?rev=1037606&r1=1037605&r2=1037606&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml Mon Nov 22 05:26:31 2010
@@ -61,10 +61,10 @@
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
<connectiondefinition-instance>
<name>jdbc/DataCDInfoDS</name>
- <config-property-setting name="UserName"></config-property-setting>
- <config-property-setting name="Password"></config-property-setting>
- <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
- <config-property-setting name="CreateDatabase">true</config-property-setting>
+ <config-property-setting name="UserName">app</config-property-setting>
+ <config-property-setting name="Password">app</config-property-setting>
+ <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
+ <config-property-setting name="CreateDatabase">true</config-property-setting>
<connectionmanager>
<xa-transaction>
<transaction-caching />
@@ -82,22 +82,22 @@
the geronimo will throw exception when persisting entities which require sequence
generation. -->
<connectiondefinition-instance>
- <name>jdbc/NoTxDataCDInfoDS</name>
- <config-property-setting name="UserName"></config-property-setting>
- <config-property-setting name="Password"></config-property-setting>
- <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
- <config-property-setting name="CreateDatabase">true</config-property-setting>
- <connectionmanager>
- <no-transaction/>
- <single-pool>
- <max-size>10</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>30</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
+ <name>jdbc/NoTxDataCDInfoDS</name>
+ <config-property-setting name="UserName">app</config-property-setting>
+ <config-property-setting name="Password">app</config-property-setting>
+ <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
+ <config-property-setting name="CreateDatabase">true</config-property-setting>
+ <connectionmanager>
+ <no-transaction/>
+ <single-pool>
+ <max-size>10</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
</connection-definition>
</outbound-resourceadapter>
</resourceadapter>
Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java?rev=1037606&r1=1037605&r2=1037606&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java (original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java Mon Nov 22 05:26:31 2010
@@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.transaction.UserTransaction;
-import org.apache.geronimo.samples.datacdinfo.core.MySessionBeanLocal;
+//import org.apache.geronimo.samples.datacdinfo.core.MySessionBeanLocal;
/**
* Servlet implementation class ListOwnerServlet
@@ -56,8 +56,8 @@ public class ListOwnerServlet extends Ht
@Resource
private UserTransaction utx;
- @EJB
- MySessionBeanLocal mysessionbean;
+ //@EJB
+ //MySessionBeanLocal mysessionbean;
/**
* @see HttpServlet#HttpServlet()
@@ -112,8 +112,11 @@ public class ListOwnerServlet extends Ht
for (Object[] owner : owners) {
out.print(owner[0].toString() + "/" + owner[1].toString() + "<br>");
}
+
+ out.print("</body>");
+ out.print("</html>");
- try {
+ /*try {
// printNameSpace(out);
out.print("<br><br>Web container context:<br>");
InitialContext ctx = new InitialContext();
@@ -128,12 +131,13 @@ public class ListOwnerServlet extends Ht
} finally {
out.print("</body>");
out.print("</html>");
- }
+ }*/
// out.print(System.getProperties());
}
+ /*
public void printNameSpace(PrintWriter out) throws NamingException {
InitialContext ctx = new InitialContext();
NamingEnumeration<NameClassPair> allnames = ctx.list("jca:/");
@@ -178,5 +182,6 @@ public class ListOwnerServlet extends Ht
}
}
}
+ */
}
Modified: geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/pom.xml?rev=1037606&r1=1037605&r2=1037606&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/pom.xml Mon Nov 22 05:26:31 2010
@@ -37,10 +37,10 @@
<description>Geronimo Samples. EJB Module</description>
<dependencies>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml?rev=1037606&r1=1037605&r2=1037606&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml Mon Nov 22 05:26:31 2010
@@ -43,6 +43,12 @@
<version>${version}</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/samples/branches/2.1/samples/jms-mdb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb/pom.xml?rev=1037606&r1=1037605&r2=1037606&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb/pom.xml Mon Nov 22 05:26:31 2010
@@ -51,7 +51,7 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/samples/branches/2.1/samples/sample-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sample-datasource/src/main/plan/plan.xml?rev=1037606&r1=1037605&r2=1037606&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sample-datasource/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/sample-datasource/src/main/plan/plan.xml Mon Nov 22 05:26:31 2010
@@ -27,6 +27,8 @@
<name>SampleTxDatasource</name>
<config-property-setting name="DatabaseName">SampleDatabase</config-property-setting>
<config-property-setting name="CreateDatabase">true</config-property-setting>
+ <config-property-setting name="UserName">app</config-property-setting>
+ <config-property-setting name="Password">app</config-property-setting>
<connectionmanager>
<xa-transaction>
<transaction-caching/>
@@ -42,6 +44,8 @@
<name>SampleNoTxDatasource</name>
<config-property-setting name="DatabaseName">SampleDatabase</config-property-setting>
<config-property-setting name="CreateDatabase">true</config-property-setting>
+ <config-property-setting name="UserName">app</config-property-setting>
+ <config-property-setting name="Password">app</config-property-setting>
<connectionmanager>
<no-transaction/>
<single-pool>