ptahchiev
Mon, 30 Jun 2008 06:14:37 -0700
Author: ptahchiev Date: Mon Jun 30 06:13:34 2008 New Revision: 672759 URL: http://svn.apache.org/viewvc?rev=672759&view=rev Log: Minor changes on the properties file, descriptions and removed comments Modified: jakarta/cactus/trunk/samples/build.properties jakarta/cactus/trunk/samples/ejb/src/main/app/application.xml jakarta/cactus/trunk/samples/ejb/src/main/resources/ejb-jar.xml jakarta/cactus/trunk/samples/ejb/src/main/resources/jboss.xml jakarta/cactus/trunk/samples/servlet/pom.xml Modified: jakarta/cactus/trunk/samples/build.properties URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/build.properties?rev=672759&r1=672758&r2=672759&view=diff ============================================================================== --- jakarta/cactus/trunk/samples/build.properties (original) +++ jakarta/cactus/trunk/samples/build.properties Mon Jun 30 06:13:34 2008 @@ -36,19 +36,21 @@ src.conf.dir=${basedir}/src/main/resources/conf/ -servlet.project.name=samples-servlet-1.8.0-SNAPSHOT -ejb.project.name=samples-ejb-1.8.0-SNAPSHOT +servlet.project.name=samples-servlet-${cactus.version} +ejb.project.name=samples-ejb-${cactus.version} +ejb3.project.name=samples-ejb3-${cactus.version} servlet.archive.name=${target.dir}/${servlet.project.name}.${cactus.sample.archive.type} ejb.archive.name=${target.dir}/${ejb.project.name}.${cactus.sample.archive.type} +ejb3.archive.name=${target.dir}/${ejb3.project.name}.${cactus.sample.archive.type} cactified.servlet.archive.name=${target.dir}/${servlet.project.name}-cactified.${cactus.sample.archive.type} cactified.ejb.archive.name=${target.dir}/${ejb.project.name}-cactified.${cactus.sample.archive.type} +cactified.ejb3.archive.name=${target.dir}/${ejb.project.name}-cactified.${cactus.sample.archive.type} #Maven Repository maven.repo=/home/peter/.m2/repository/ - #Container settings tomcat.container.id=tomcat5x jboss.container.id=jboss42x Modified: jakarta/cactus/trunk/samples/ejb/src/main/app/application.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/src/main/app/application.xml?rev=672759&r1=672758&r2=672759&view=diff ============================================================================== --- jakarta/cactus/trunk/samples/ejb/src/main/app/application.xml (original) +++ jakarta/cactus/trunk/samples/ejb/src/main/app/application.xml Mon Jun 30 06:13:34 2008 @@ -10,7 +10,7 @@ <application> <display-name>cactus-sample-ejb</display-name> - <description>Cactus EJB Sample for J2EE 1.3</description> + <description>Cactus EJB Sample</description> <module> <ejb>samples-ejb-1.8.0-SNAPSHOT.jar</ejb> </module> Modified: jakarta/cactus/trunk/samples/ejb/src/main/resources/ejb-jar.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/src/main/resources/ejb-jar.xml?rev=672759&r1=672758&r2=672759&view=diff ============================================================================== --- jakarta/cactus/trunk/samples/ejb/src/main/resources/ejb-jar.xml (original) +++ jakarta/cactus/trunk/samples/ejb/src/main/resources/ejb-jar.xml Mon Jun 30 06:13:34 2008 @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE ejb-jar PUBLIC -'-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN' -'http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd'> - -<ejb-jar> - <display-name>cactus-sample-ejb</display-name> - <enterprise-beans> - <session> - <description>Converter Session Bean</description> - <display-name>Converter</display-name> - <ejb-name>Converter</ejb-name> - <home>org.apache.cactus.sample.ejb.ConverterHome</home> - <remote>org.apache.cactus.sample.ejb.Converter</remote> - <ejb-class>org.apache.cactus.sample.ejb.ConverterEJB</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - <!--session> - <ejb-name>CactusEjbRedirector</ejb-name> - <home>org.apache.cactus.internal.server.EJBTestRedirectorHome</home> - <remote>org.apache.cactus.internal.server.EJBTestRedirector</remote> - <ejb-class>org.apache.cactus.internal.server.EJBTestRedirectorBean</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - <session> - <ejb-name>TEST</ejb-name> - <home>org.apache.cactus.sample.ejb.redirector.TestHome</home> - <remote>org.apache.cactus.sample.ejb.redirector.ITestBean</remote> - <ejb-class>org.apache.cactus.sample.ejb.redirector.TestBean</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - <message-driven> - <ejb-name>SampleMDB</ejb-name> - <ejb-class>org.apache.cactus.sample.ejb.SampleMDB</ejb-class> - <transaction-type>Container</transaction-type> - <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode> - <message-driven-destination> - <destination-type>javax.jms.Queue</destination-type> - </message-driven-destination> - <resource-ref> - <res-ref-name>jms/QCF</res-ref-name> - <res-type>javax.jms.QueueConnectionFactory</res-type> - <res-auth>Container</res-auth> - </resource-ref> - </message-driven> - <message-driven> - <ejb-name>RedirectorMDB</ejb-name> - <ejb-class>org.apache.cactus.spi.server.MessageDrivenBeanRedirector</ejb-class> - <transaction-type>Container</transaction-type> - <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode> - <message-driven-destination> - <destination-type>javax.jms.Queue</destination-type> - </message-driven-destination> - <resource-ref> - <res-ref-name>jms/QCF1</res-ref-name> - <res-type>javax.jms.QueueConnectionFactory</res-type> - <res-auth>Container</res-auth> - </resource-ref> - </message-driven--> - </enterprise-beans> - <assembly-descriptor> - <container-transaction> - <method> - <ejb-name>Converter</ejb-name> - <method-intf>Remote</method-intf> - <method-name>*</method-name> - </method> - <trans-attribute>NotSupported</trans-attribute> - </container-transaction> - <!--container-transaction> - <method> - <ejb-name>RedirectorMDB</ejb-name> - <method-name>*</method-name> - </method> - <trans-attribute>NotSupported</trans-attribute> - </container-transaction> - <container-transaction> - <method> - <ejb-name>SampleMDB</ejb-name> - <method-name>*</method-name> - </method> - <trans-attribute>NotSupported</trans-attribute> - </container-transaction--> - </assembly-descriptor> -</ejb-jar> \ No newline at end of file Modified: jakarta/cactus/trunk/samples/ejb/src/main/resources/jboss.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/src/main/resources/jboss.xml?rev=672759&r1=672758&r2=672759&view=diff ============================================================================== --- jakarta/cactus/trunk/samples/ejb/src/main/resources/jboss.xml (original) +++ jakarta/cactus/trunk/samples/ejb/src/main/resources/jboss.xml Mon Jun 30 06:13:34 2008 @@ -1,29 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <jboss> <enterprise-beans> - <!--message-driven> - <ejb-name>SampleMDB</ejb-name> - <destination-jndi-name>queue/cQueue</destination-jndi-name> - <resource-ref> - <res-ref-name>jms/QCF</res-ref-name> - <jndi-name>QueueConnectionFactory</jndi-name> - </resource-ref> - </message-driven> - <message-driven> - <ejb-name>RedirectorMDB</ejb-name> - <destination-jndi-name>queue/cactusQueue</destination-jndi-name> - <resource-ref> - <res-ref-name>jms/QCF1</res-ref-name> - <jndi-name>QueueConnectionFactory</jndi-name> - </resource-ref> - </message-driven> - <session> - <ejb-name>CactusEjbRedirector</ejb-name> - <jndi-name>CACTUS/EJBREDIRECTOR</jndi-name> - </session> - <session> - <ejb-name>TEST</ejb-name> - <jndi-name>CACTUS/TEST</jndi-name> - </session--> </enterprise-beans> </jboss> \ No newline at end of file Modified: jakarta/cactus/trunk/samples/servlet/pom.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/servlet/pom.xml?rev=672759&r1=672758&r2=672759&view=diff ============================================================================== --- jakarta/cactus/trunk/samples/servlet/pom.xml (original) +++ jakarta/cactus/trunk/samples/servlet/pom.xml Mon Jun 30 06:13:34 2008 @@ -75,13 +75,13 @@ <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> - <version>0.9</version> + <version>1.0-alpha-4</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-ant</artifactId> - <version>0.9</version> + <version>1.0-alpha-4</version> <scope>provided</scope> </dependency> @@ -188,7 +188,7 @@ <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-alpha-4</version> <executions> <execution> <id>start-container</id> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]