Author: ptahchiev
Date: Fri Sep 19 01:05:51 2008
New Revision: 696970
URL: http://svn.apache.org/viewvc?rev=696970&view=rev
Log:
Changes on the ejb samples.
Added:
jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/
jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/README (with
props)
jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/ejb-jar.xml
(with props)
Removed:
jakarta/cactus/trunk/samples/ejb/src/main/java/org/apache/cactus/sample/ejb/redirector/
Modified:
jakarta/cactus/trunk/samples/ejb/build.xml
jakarta/cactus/trunk/samples/ejb/pom.xml
jakarta/cactus/trunk/samples/ejb/src/main/java/org/apache/cactus/sample/ejb/SampleMDB.java
jakarta/cactus/trunk/samples/ejb/src/main/resources/ejb-jar.xml
jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/cactus-web.xml
jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/web.xml
Modified: jakarta/cactus/trunk/samples/ejb/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/build.xml?rev=696970&r1=696969&r2=696970&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/build.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/build.xml Fri Sep 19 01:05:51 2008
@@ -148,7 +148,7 @@
step. For example: JBoss -->
<jar jarfile="${target.dir}/${ejb.project.name}.jar">
<fileset dir="${build.dir}"/>
- <metainf dir="${meta.inf.dir}"/>
+ <metainf dir="${meta.inf.dir}/META-INF"/>
</jar>
</target>
Modified: jakarta/cactus/trunk/samples/ejb/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/pom.xml?rev=696970&r1=696969&r2=696970&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/pom.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/pom.xml Fri Sep 19 01:05:51 2008
@@ -156,28 +156,37 @@
<srcFile>target/cactus.samples.ejb-1.8.1-SNAPSHOT-bin.ear</srcFile>
<destFile>${project.build.directory}/${pom.artifactId}-cactified.ear</destFile>
<!--mergeWebXml>src/main/webapp/WEB-INF/cactus-web.xml</mergeWebXml-->
- <libDependencies>
- <dependency>
-
<groupId>javax.servlet</groupId>
-
<artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
-
<groupId>httpunit</groupId>
-
<artifactId>httpunit</artifactId>
- </dependency>
- </libDependencies>
- <redirectors>
- <servletRedirector>
-
<name>ServletRedirectorSecure</name>
-
<mapping>/ServletRedirectorSecure</mapping>
- <roles>test</roles>
- </servletRedirector>
- <servletRedirector/>
- <filterRedirector>
-
<name>FilterRedirector</name>
-
<mapping>/test/filterRedirector</mapping>
- </filterRedirector>
- </redirectors>
+ <cactusWar>
+ <redirectors>
+ <servletRedirector>
+
<name>ServletRedirectorSecure</name>
+
<mapping>/ServletRedirectorSecure</mapping>
+
<roles>test</roles>
+ </servletRedirector>
+ <servletRedirector/>
+ <filterRedirector>
+
<name>FilterRedirector</name>
+
<mapping>/test/filterRedirector</mapping>
+ </filterRedirector>
+ </redirectors>
+ <libDependencies>
+ <dependency>
+
<groupId>javax.servlet</groupId>
+
<artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+
<groupId>httpunit</groupId>
+
<artifactId>httpunit</artifactId>
+ </dependency>
+ </libDependencies>
+ <classes>
+
<directory>target/classes</directory>
+ <includes>
+
<include>**/*Test*.*</include>
+ </includes>
+ </classes>
+ <version>2.3</version>
+ </cactusWar>
</configuration>
<executions>
<execution>
@@ -225,10 +234,7 @@
<deployables>
<deployable>
<location>${project.build.directory}/${pom.artifactId}-cactified.ear</location>
- <type>war</type>
- <properties>
-
<context>/test</context>
- </properties>
+ <type>ear</type>
<pingURL>http://localhost:8080/</pingURL>
</deployable>
</deployables>
@@ -257,7 +263,7 @@
<systemProperties>
<property>
<name>cactus.contextURL</name>
-
<value>http://localhost:8080/test/</value>
+
<value>http://localhost:8080/cactus.samples.ejb-cactified/cactus/</value>
</property>
<property>
<name>cactus.filterRedirectorName</name>
Modified:
jakarta/cactus/trunk/samples/ejb/src/main/java/org/apache/cactus/sample/ejb/SampleMDB.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/src/main/java/org/apache/cactus/sample/ejb/SampleMDB.java?rev=696970&r1=696969&r2=696970&view=diff
==============================================================================
---
jakarta/cactus/trunk/samples/ejb/src/main/java/org/apache/cactus/sample/ejb/SampleMDB.java
(original)
+++
jakarta/cactus/trunk/samples/ejb/src/main/java/org/apache/cactus/sample/ejb/SampleMDB.java
Fri Sep 19 01:05:51 2008
@@ -1,4 +1,24 @@
package org.apache.cactus.sample.ejb;
+/*
+ * ========================================================================
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ========================================================================
+ */
import javax.ejb.EJBException;
import javax.ejb.MessageDrivenBean;
import javax.ejb.MessageDrivenContext;
Added: jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/README
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/README?rev=696970&view=auto
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/README (added)
+++ jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/README Fri Sep
19 01:05:51 2008
@@ -0,0 +1,3 @@
+This sample application demonstrates:
+- how to write Cactus test cases for EJBs
+- how to use the Ant Integration to deploy EARs from your own Ant build file
Propchange: jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/README
------------------------------------------------------------------------------
svn:eol-style = native
Added: jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/ejb-jar.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/ejb-jar.xml?rev=696970&view=auto
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/ejb-jar.xml
(added)
+++ jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/ejb-jar.xml
Fri Sep 19 01:05:51 2008
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!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>
+ </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>
+ </assembly-descriptor>
+</ejb-jar>
Propchange:
jakarta/cactus/trunk/samples/ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=696970&r1=696969&r2=696970&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 Fri Sep 19
01:05:51 2008
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!DOCTYPE ejb-jar PUBLIC
'-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN'
Modified:
jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/cactus-web.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/cactus-web.xml?rev=696970&r1=696969&r2=696970&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/cactus-web.xml
(original)
+++ jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/cactus-web.xml Fri
Sep 19 01:05:51 2008
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd";>
Modified: jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/web.xml?rev=696970&r1=696969&r2=696970&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/web.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/web.xml Fri Sep 19
01:05:51 2008
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd";>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
