You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2006/12/30 02:40:08 UTC
svn commit: r491149 [3/3] - in /incubator/openejb/trunk/openejb3:
assembly/openejb-standalone/src/main/resources/ container/
container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/alt/config/
container/openejb-core/src/main/jav...
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml?view=diff&rev=491149&r1=491148&r2=491149
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml Fri Dec 29 17:40:06 2006
@@ -21,10 +21,10 @@
<!-- $Rev$ $Date$ -->
<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
- version="3.0" metadata-complete="true">
+ version="3.0" metadata-complete="true">
<description>
This ejb-jar file contains assembled enterprise beans that are
@@ -69,6 +69,10 @@
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<!--
@@ -93,6 +97,10 @@
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<!--
@@ -122,6 +130,10 @@
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<!--
@@ -151,6 +163,10 @@
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<!--
@@ -249,13 +265,16 @@
<res-auth>Container</res-auth>
</resource-ref>
<persistence-unit-ref>
- <description>
- Persistence unit for testing the functionality.
- </description>
- <persistence-unit-ref-name>persistence/TestUnit</persistence-unit-ref-name>
- <persistence-unit-name>openjpa-test-unit</persistence-unit-name>
- </persistence-unit-ref>
-
+ <description>
+ Persistence unit for testing the functionality.
+ </description>
+ <persistence-unit-ref-name>persistence/TestUnit</persistence-unit-ref-name>
+ <persistence-unit-name>openjpa-test-unit</persistence-unit-name>
+ </persistence-unit-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<!--
@@ -349,13 +368,16 @@
<res-auth>Container</res-auth>
</resource-ref>
<persistence-unit-ref>
- <description>
- Persistence unit for testing the functionality.
- </description>
- <persistence-unit-ref-name>persistence/TestUnit</persistence-unit-ref-name>
- <persistence-unit-name>openjpa-test-unit</persistence-unit-name>
- </persistence-unit-ref>
-
+ <description>
+ Persistence unit for testing the functionality.
+ </description>
+ <persistence-unit-ref-name>persistence/TestUnit</persistence-unit-ref-name>
+ <persistence-unit-name>openjpa-test-unit</persistence-unit-name>
+ </persistence-unit-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<!--
@@ -453,13 +475,16 @@
<res-auth>Container</res-auth>
</resource-ref>
<persistence-unit-ref>
- <description>
- Persistence unit for testing the functionality.
- </description>
- <persistence-unit-ref-name>persistence/TestUnit</persistence-unit-ref-name>
- <persistence-unit-name>openjpa-test-unit</persistence-unit-name>
- </persistence-unit-ref>
-
+ <description>
+ Persistence unit for testing the functionality.
+ </description>
+ <persistence-unit-ref-name>persistence/TestUnit</persistence-unit-ref-name>
+ <persistence-unit-name>openjpa-test-unit</persistence-unit-name>
+ </persistence-unit-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<!--
@@ -492,6 +517,10 @@
<role-name>TheMan</role-name>
<role-link>Executive</role-link>
</security-role-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<!--
@@ -524,6 +553,10 @@
<role-name>TheMan</role-name>
<role-link>Executive</role-link>
</security-role-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<!--
@@ -561,6 +594,10 @@
</query-method>
<ejb-ql>SELECT OBJECT(A) FROM OneToOneA A</ejb-ql>
</query>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<entity>
<ejb-name>OneToOneB</ejb-name>
@@ -595,6 +632,10 @@
</query-method>
<ejb-ql>SELECT OBJECT(B) FROM OneToOneB B</ejb-ql>
</query>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<entity>
@@ -624,6 +665,10 @@
</query-method>
<ejb-ql>SELECT OBJECT(A) FROM OneToManyA A</ejb-ql>
</query>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<entity>
<ejb-name>OneToManyB</ejb-name>
@@ -658,6 +703,10 @@
</query-method>
<ejb-ql>SELECT OBJECT(B) FROM OneToManyB B</ejb-ql>
</query>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<entity>
@@ -678,6 +727,10 @@
<field-name>field1</field-name>
</cmp-field>
<primkey-field>id</primkey-field>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<entity>
@@ -694,6 +747,10 @@
<field-name>id</field-name>
</cmp-field>
<primkey-field>id</primkey-field>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<entity>
@@ -703,7 +760,7 @@
<ejb-class>org.apache.openejb.test.entity.cmr.cmrmapping.ManyOwningSideBean_JPA</ejb-class>
<persistence-type>Container</persistence-type>
<!--<prim-key-class>org.apache.openejb.test.entity.cmr.cmrmapping.CompoundPK</prim-key-class>-->
- <prim-key-class>java.lang.Integer</prim-key-class>
+ <prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>Order</abstract-schema-name>
@@ -723,6 +780,10 @@
</query-method>
<ejb-ql>SELECT m.oneInverseSide FROM Order m WHERE m.id = ?1</ejb-ql>
</query>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>openejb/cmp</persistence-unit-ref-name>
+ <persistence-unit-name>cmp</persistence-unit-name>
+ </persistence-unit-ref>
</entity>
<!--
@@ -1858,8 +1919,8 @@
<role-link>Executive</role-link>
</security-role-ref>
</entity>
-
- <!--
+
+ <!--
########################################################
########################################################
######### MESSAGE D R I V E N B E A N S #########
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml?view=diff&rev=491149&r1=491148&r2=491149
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml Fri Dec 29 17:40:06 2006
@@ -16,17 +16,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<persistence>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+ <persistence-unit transaction-type="JTA" name="cmp">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <jta-data-source>java:openejb/connector/Default JDBC Database</jta-data-source>
+ <non-jta-data-source>java:openejb/connector/Default JDBC Database</non-jta-data-source>
+ <mapping-file>META-INF/jpa.mapping.xml</mapping-file>
+ <class>org.apache.openejb.test.entity.cmp.BasicCmpBean</class>
+ <exclude-unlisted-classes>false</exclude-unlisted-classes>
+ </persistence-unit>
<persistence-unit name="openjpa-test-unit">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.openejb.test.entity.Customer</class>
<jta-data-source>java:openejb/connector/Default JDBC Database</jta-data-source>
- <properties>
- <!-- <property name="openjpa.jdbc.SynchronizeMappings"
- value="buildSchema(ForeignKeys=true)"/> -->
- <property name="openjpa.ConnectionFactoryMode"
- value="managed"/>
- <property name="openjpa.ManagedRuntime" value="org.apache.openjpa.ee.OpenEJBManagedRuntime"/>
- </properties>
+ <non-jta-data-source>java:openejb/connector/Default JDBC Database</non-jta-data-source>
+ <class>org.apache.openejb.test.entity.Customer</class>
</persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>
Modified: incubator/openejb/trunk/openejb3/server/openejb-admin/src/main/java/org/apache/openejb/App.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-admin/src/main/java/org/apache/openejb/App.java?view=diff&rev=491149&r1=491148&r2=491149
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-admin/src/main/java/org/apache/openejb/App.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-admin/src/main/java/org/apache/openejb/App.java Fri Dec 29 17:40:06 2006
@@ -1,19 +1,19 @@
-/**
- * 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.
- */
+/**
+ * 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.
+ */
package org.apache.openejb;
/**
Modified: incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml?view=diff&rev=491149&r1=491148&r2=491149
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml Fri Dec 29 17:40:06 2006
@@ -30,9 +30,40 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+
+ <!-- TODO switch to maven version of plugin when it is released -->
+ <!--groupId>org.apache.maven.plugins</groupId-->
+ <!--artifactId>maven-dependency-plugin</artifactId-->
+
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${pom.version}</version>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <!-- DEBUG: Uncomment this line and comment out the next -->
+ <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${basedir}/target/openejb-javaagent-${pom.version}.jar=foo=bar</argLine>-->
+ <argLine>-javaagent:${basedir}/target/openejb-javaagent-${pom.version}.jar=foo=bar</argLine>
<systemProperties>
<property>
<name>openejb.home</name>
Modified: incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml?view=diff&rev=491149&r1=491148&r2=491149
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml Fri Dec 29 17:40:06 2006
@@ -30,9 +30,43 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+
+ <!-- TODO switch to maven version of plugin when it is released -->
+ <!--groupId>org.apache.maven.plugins</groupId-->
+ <!--artifactId>maven-dependency-plugin</artifactId-->
+
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <!-- DEBUG: Uncomment this line and comment out the next -->
+ <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${basedir}/target/openejb-javaagent-${pom.version}.jar=foo=bar</argLine>-->
+ <argLine>-javaagent:${basedir}/target/openejb-javaagent-${pom.version}.jar=foo=bar</argLine>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${pom.version}</version>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <!-- DEBUG: Uncomment this line and comment out the next -->
+ <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${basedir}/target/openejb-javaagent-${pom.version}.jar=foo=bar</argLine>-->
+ <argLine>-javaagent:${basedir}/target/openejb-javaagent-${pom.version}.jar=foo=bar</argLine>
<systemProperties>
<property>
<name>openejb.home</name>
Modified: incubator/openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpServer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpServer.java?view=diff&rev=491149&r1=491148&r2=491149
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpServer.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpServer.java Fri Dec 29 17:40:06 2006
@@ -21,7 +21,6 @@
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.server.ServerService;
import org.apache.openejb.server.ServiceException;
-import sun.net.www.protocol.http.HttpURLConnection;
import java.io.IOException;
import java.io.InputStream;
@@ -146,7 +145,7 @@
req.readMessage(in);
res.setRequest(req);
} catch (Throwable t) {
- res.setCode(HttpURLConnection.HTTP_BAD_REQUEST);
+ res.setCode(400);
res.setResponseString("Could not read the request");
res.getPrintWriter().println(t.getMessage());
t.printStackTrace(res.getPrintWriter());
Modified: incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java?view=diff&rev=491149&r1=491148&r2=491149
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java Fri Dec 29 17:40:06 2006
@@ -16,29 +16,21 @@
*/
package org.apache.openejb.server;
-import java.util.Properties;
-import java.net.URI;
import java.io.IOException;
+import java.net.URI;
+import java.util.Properties;
import org.apache.openejb.OpenEJB;
import org.apache.openejb.core.ServerFederation;
-import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.Messages;
import org.apache.openejb.util.PropertiesService;
-import org.apache.openejb.util.SafeToolkit;
/**
* @org.apache.xbean.XBean element="server"
* description="OpenEJB Server"
- *
+ *
* @version $Rev$ $Date$
*/
public class Server implements org.apache.openejb.spi.Service {
-
- private SafeToolkit toolkit = SafeToolkit.getToolkit("OpenEJB EJB Server");
- private Messages _messages = new Messages("org.apache.openejb.server");
- private Logger logger = Logger.getInstance("OpenEJB.server.remote", "org.apache.openejb.server");
-
// FIXME: Remove it completely once we ensure PropertiesService (below) works well
Properties props;
@@ -98,8 +90,6 @@
public static class ServerServiceFactory {
public ServerService createService(URI location) throws IOException {
- String scheme = location.getScheme();
-
return null;
}
}