You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/04/22 03:55:29 UTC
svn commit: r1328766 - in /openejb/branches/openejb-4.0.0: ./
arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/
arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi...
Author: dblevins
Date: Sun Apr 22 01:55:28 2012
New Revision: 1328766
URL: http://svn.apache.org/viewvc?rev=1328766&view=rev
Log:
svn merge -r 1328764:1328765 https://svn.apache.org/repos/asf/openejb/trunk/openejb
http://svn.apache.org/viewvc?view=revision&revision=1328765
------------------------------------------------------------------------
r1328765 | dblevins | 2012-04-21 18:52:35 -0700 (Sat, 21 Apr 2012) | 4 lines
- Add LICENSE and NOTICE files to osgi modules
- Temporarily remove ssh zip
- Fix typo in provisioning zip LICENSE file name
------------------------------------------------------------------------
Added:
openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/GeneratedAccessorFactory.java
openejb/branches/openejb-4.0.0/osgi/openejb-karaf-commands/src/main/resources/META-INF/
- copied from r1328765, openejb/trunk/openejb/osgi/openejb-karaf-commands/src/main/resources/META-INF/
openejb/branches/openejb-4.0.0/osgi/openejb-karaf-commands/src/main/resources/META-INF/LICENSE
- copied unchanged from r1328765, openejb/trunk/openejb/osgi/openejb-karaf-commands/src/main/resources/META-INF/LICENSE
openejb/branches/openejb-4.0.0/osgi/openejb-karaf-commands/src/main/resources/META-INF/NOTICE
- copied unchanged from r1328765, openejb/trunk/openejb/osgi/openejb-karaf-commands/src/main/resources/META-INF/NOTICE
openejb/branches/openejb-4.0.0/osgi/openejb-karaf-rebranding/src/main/resources/META-INF/
- copied from r1328765, openejb/trunk/openejb/osgi/openejb-karaf-rebranding/src/main/resources/META-INF/
openejb/branches/openejb-4.0.0/osgi/openejb-karaf-rebranding/src/main/resources/META-INF/LICENSE
- copied unchanged from r1328765, openejb/trunk/openejb/osgi/openejb-karaf-rebranding/src/main/resources/META-INF/LICENSE
openejb/branches/openejb-4.0.0/osgi/openejb-karaf-rebranding/src/main/resources/META-INF/NOTICE
- copied unchanged from r1328765, openejb/trunk/openejb/osgi/openejb-karaf-rebranding/src/main/resources/META-INF/NOTICE
openejb/branches/openejb-4.0.0/utils/openejb-provisionning/src/main/legal/LICENSE
- copied unchanged from r1328765, openejb/trunk/openejb/utils/openejb-provisionning/src/main/legal/LICENSE
Removed:
openejb/branches/openejb-4.0.0/utils/openejb-provisionning/src/main/legal/LICENCE
Modified:
openejb/branches/openejb-4.0.0/ (props changed)
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java
openejb/branches/openejb-4.0.0/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/JAXBContextFactory.java
openejb/branches/openejb-4.0.0/container/openejb-jee/src/test/resources/jsf/ (props changed)
openejb/branches/openejb-4.0.0/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
openejb/branches/openejb-4.0.0/examples/application-composer/ (props changed)
openejb/branches/openejb-4.0.0/server/openejb-ssh/pom.xml
openejb/branches/openejb-4.0.0/src/ (props changed)
openejb/branches/openejb-4.0.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
openejb/branches/openejb-4.0.0/utils/openejb-provisionning/src/main/legal/ (props changed)
Propchange: openejb/branches/openejb-4.0.0/
------------------------------------------------------------------------------
Merged /openejb/trunk/openejb:r1328765
Modified: openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java?rev=1328766&r1=1328765&r2=1328766&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java (original)
+++ openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java Sun Apr 22 01:55:28 2012
@@ -44,9 +44,6 @@ import java.util.concurrent.ConcurrentHa
public class EmbeddedTomEEContainer extends TomEEContainer<EmbeddedTomEEConfiguration> {
- public static final String TOMEE_ARQUILLIAN_HTTP_PORT = "tomee.arquillian.http";
- public static final String TOMEE_ARQUILLIAN_STOP_PORT = "tomee.arquillian.stop";
-
@Inject
@ContainerScoped
private InstanceProducer<Context> contextInstance;
Modified: openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java?rev=1328766&r1=1328765&r2=1328766&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java (original)
+++ openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java Sun Apr 22 01:55:28 2012
@@ -20,6 +20,7 @@ import org.apache.openejb.arquillian.tes
import org.apache.openejb.arquillian.tests.Tests;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
@@ -31,6 +32,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import java.io.IOException;
+import java.net.URL;
@RunWith(Arquillian.class)
public class ServletCdiConstructorInjectionTest {
@@ -66,6 +68,9 @@ public class ServletCdiConstructorInject
return archive;
}
+ @ArquillianResource
+ private URL url;
+
private void validateTest(String expectedOutput) throws IOException {
Tests.assertOutput("http://localhost:" + System.getProperty("tomee.httpPort", "11080") + "/" + TEST_NAME + "/" + TEST_NAME, expectedOutput);
}
Propchange: openejb/branches/openejb-4.0.0/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
Merged /openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:r1328765
Modified: openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java?rev=1328766&r1=1328765&r2=1328766&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java (original)
+++ openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java Sun Apr 22 01:55:28 2012
@@ -18,6 +18,8 @@
package org.apache.openejb.jee;
+import com.sun.xml.bind.XmlAccessorFactory;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -78,6 +80,7 @@ import java.util.Map;
"assemblyDescriptor",
"ejbClientJar"
})
+@XmlAccessorFactory(GeneratedAccessorFactory.class)
public class EjbJar implements NamedModule {
@XmlElement(name = "module-name")
protected String moduleName;
Added: openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/GeneratedAccessorFactory.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/GeneratedAccessorFactory.java?rev=1328766&view=auto
==============================================================================
--- openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/GeneratedAccessorFactory.java (added)
+++ openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/GeneratedAccessorFactory.java Sun Apr 22 01:55:28 2012
@@ -0,0 +1,96 @@
+/*
+ * 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.jee;
+
+import com.sun.xml.bind.v2.runtime.reflect.Accessor;
+import com.sun.xml.bind.v2.runtime.reflect.opt.FieldAccessor_Byte;
+import com.sun.xml.bind.v2.runtime.reflect.opt.MethodAccessor_Byte;
+
+import javax.xml.bind.JAXBException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+import static com.sun.xml.bind.v2.bytecode.ClassTailor.toVMClassName;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class GeneratedAccessorFactory implements com.sun.xml.bind.AccessorFactory {
+
+ private static final String fieldTemplateName;
+ private static final String methodTemplateName;
+
+ static {
+ String s = FieldAccessor_Byte.class.getName();
+ fieldTemplateName = s.substring(0, s.length() - "Byte".length()).replace('.', '/');
+
+ s = MethodAccessor_Byte.class.getName();
+ methodTemplateName = s.substring(0, s.length() - "Byte".length()).replace('.', '/');
+ }
+
+
+ @Override
+ public Accessor createFieldAccessor(Class bean, Field field, boolean readOnly) throws JAXBException {
+ int mods = field.getModifiers();
+ if (Modifier.isPrivate(mods) || Modifier.isFinal(mods))
+ // we can't access private fields
+ return null;
+
+ String newClassName = toVMClassName(field.getDeclaringClass()) + "$JaxbAccessorF_" + field.getName();
+
+ return null;
+ }
+
+ @Override
+ public Accessor createPropertyAccessor(Class bean, Method getter, Method setter) throws JAXBException {
+ // make sure the method signatures are what we expect
+ if (getter.getParameterTypes().length != 0)
+ return null;
+ Class<?>[] sparams = setter.getParameterTypes();
+ if (sparams.length != 1)
+ return null;
+ if (sparams[0] != getter.getReturnType())
+ return null;
+ if (setter.getReturnType() != Void.TYPE)
+ return null;
+ if (getter.getDeclaringClass() != setter.getDeclaringClass())
+ return null;
+ if (Modifier.isPrivate(getter.getModifiers()) || Modifier.isPrivate(setter.getModifiers()))
+ // we can't access private fields
+ return null;
+
+ Class t = sparams[0];
+ String typeName = t.getName().replace('.', '_');
+ if (t.isArray()) {
+ typeName = "AOf_";
+ String compName = t.getComponentType().getName().replace('.', '_');
+ while (compName.startsWith("[L")) {
+ compName = compName.substring(2);
+ typeName += "AOf_";
+ }
+ typeName = typeName + compName;
+ }
+
+ String newClassName = toVMClassName(getter.getDeclaringClass()) + "$JaxbAccessorM_" + getter.getName() + '_' + setter.getName() + '_' + typeName;
+
+
+ return null;
+ }
+
+
+}
\ No newline at end of file
Modified: openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/JAXBContextFactory.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/JAXBContextFactory.java?rev=1328766&r1=1328765&r2=1328766&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/JAXBContextFactory.java (original)
+++ openejb/branches/openejb-4.0.0/container/openejb-jee/src/main/java/org/apache/openejb/jee/JAXBContextFactory.java Sun Apr 22 01:55:28 2012
@@ -17,8 +17,11 @@
*/
package org.apache.openejb.jee;
+import com.sun.xml.bind.api.JAXBRIContext;
+
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
+import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
@@ -90,7 +93,9 @@ public final class JAXBContextFactory {
sb.deleteCharAt(sb.length() - 1);
final Event event = Event.start(sb.toString());
try {
- return JAXBContext.newInstance(classes);
+ final Map<String, Object> properties = new HashMap<String, Object>();
+// properties.put(JAXBRIContext.XMLACCESSORFACTORY_SUPPORT, true);
+ return JAXBContext.newInstance(classes, properties);
} finally {
event.stop();
}
Propchange: openejb/branches/openejb-4.0.0/container/openejb-jee/src/test/resources/jsf/
------------------------------------------------------------------------------
Merged /openejb/trunk/openejb/container/openejb-jee/src/test/resources/jsf:r1328765
Propchange: openejb/branches/openejb-4.0.0/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
Merged /openejb/trunk/openejb/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:r1328765
Propchange: openejb/branches/openejb-4.0.0/examples/application-composer/
------------------------------------------------------------------------------
Merged /openejb/trunk/openejb/examples/application-composer:r1328765
Modified: openejb/branches/openejb-4.0.0/server/openejb-ssh/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/server/openejb-ssh/pom.xml?rev=1328766&r1=1328765&r2=1328766&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/server/openejb-ssh/pom.xml (original)
+++ openejb/branches/openejb-4.0.0/server/openejb-ssh/pom.xml Sun Apr 22 01:55:28 2012
@@ -67,7 +67,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+<!--
<build>
<plugins>
<plugin>
@@ -92,4 +92,5 @@
</plugin>
</plugins>
</build>
+-->
</project>
Propchange: openejb/branches/openejb-4.0.0/src/
------------------------------------------------------------------------------
Merged /openejb/trunk/openejb/src:r1328765
Modified: openejb/branches/openejb-4.0.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java?rev=1328766&r1=1328765&r2=1328766&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java (original)
+++ openejb/branches/openejb-4.0.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java Sun Apr 22 01:55:28 2012
@@ -22,7 +22,6 @@ package org.apache.tomee.embedded;
public class Configuration {
private int httpPort = 8080;
- private int ajpPort = 8009;
private int stopPort = 8005;
protected String dir;
@@ -42,14 +41,6 @@ public class Configuration {
this.stopPort = stopPort;
}
- public int getAjpPort() {
- return ajpPort;
- }
-
- public void setAjpPort(int ajpPort) {
- this.ajpPort = ajpPort;
- }
-
public String getDir() {
return dir;
}
Propchange: openejb/branches/openejb-4.0.0/utils/openejb-provisionning/src/main/legal/
------------------------------------------------------------------------------
Merged /openejb/trunk/openejb/utils/openejb-provisionning/src/main/legal:r1328765