Author: rmannibucau
Date: Sun Jul 8 21:15:49 2012
New Revision: 1358841
URL: http://svn.apache.org/viewvc?rev=1358841&view=rev
Log:
TOMEE-271 tomcat 7.0.29
Modified:
openejb/trunk/openejb/examples/webapps/rest-example/pom.xml
openejb/trunk/openejb/examples/webapps/rest-example/src/test/java/org/superbiz/rest/dao/UserServiceTest.java
openejb/trunk/openejb/pom.xml
openejb/trunk/openejb/tomee/apache-tomcat/pom.xml
openejb/trunk/openejb/tomee/pom.xml
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Modified: openejb/trunk/openejb/examples/webapps/rest-example/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/rest-example/pom.xml?rev=1358841&r1=1358840&r2=1358841&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/rest-example/pom.xml (original)
+++ openejb/trunk/openejb/examples/webapps/rest-example/pom.xml Sun Jul 8
21:15:49 2012
@@ -189,7 +189,7 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>tomee-webservices</artifactId>
+ <artifactId>tomee-jaxrs</artifactId>
<version>${tomee.version}</version>
<scope>test</scope>
</dependency>
Modified:
openejb/trunk/openejb/examples/webapps/rest-example/src/test/java/org/superbiz/rest/dao/UserServiceTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/rest-example/src/test/java/org/superbiz/rest/dao/UserServiceTest.java?rev=1358841&r1=1358840&r2=1358841&view=diff
==============================================================================
---
openejb/trunk/openejb/examples/webapps/rest-example/src/test/java/org/superbiz/rest/dao/UserServiceTest.java
(original)
+++
openejb/trunk/openejb/examples/webapps/rest-example/src/test/java/org/superbiz/rest/dao/UserServiceTest.java
Sun Jul 8 21:15:49 2012
@@ -73,7 +73,7 @@ public class UserServiceTest {
User user = dao.create("foo", "dummy", "[email protected]");
assertNotNull(dao.find(user.getId()));
- String uri = "http://127.0.0.1:"; +
System.getProperty(EmbeddedTomEEContainer.TOMEE_EJBCONTAINER_HTTP_PORT) + "/" +
webApp.getName();
+ String uri = "http://127.0.0.1:"; +
System.getProperty(EmbeddedTomEEContainer.TOMEE_EJBCONTAINER_HTTP_PORT) +
"/rest-example";
UserServiceClientAPI client = JAXRSClientFactory.create(uri,
UserServiceClientAPI.class);
User retrievedUser = client.show(user.getId());
assertNotNull(retrievedUser);
Modified: openejb/trunk/openejb/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1358841&r1=1358840&r2=1358841&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Sun Jul 8 21:15:49 2012
@@ -117,8 +117,8 @@
<javaee-api.version>6.0-4</javaee-api.version>
<!-- Used mainly in assembly/openejb-tomcat* projects -->
- <tomcat.bundle.version>7.0.28-SNAPSHOT</tomcat.bundle.version> <!-- don't
merge with tomcat.version since we can release it ourself -->
- <tomcat.version>7.0.28</tomcat.version>
+ <tomcat.bundle.version>7.0.29-SNAPSHOT</tomcat.bundle.version> <!-- don't
merge with tomcat.version since we can release it ourself -->
+ <tomcat.version>7.0.29</tomcat.version>
<!-- used mainly by jetty modules -->
<cxf.version>2.6.1</cxf.version>
Modified: openejb/trunk/openejb/tomee/apache-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomcat/pom.xml?rev=1358841&r1=1358840&r2=1358841&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomcat/pom.xml (original)
+++ openejb/trunk/openejb/tomee/apache-tomcat/pom.xml Sun Jul 8 21:15:49 2012
@@ -28,7 +28,7 @@
<artifactId>apache-tomcat</artifactId>
<name>OpenEJB :: TomEE :: Apache Tomcat</name>
- <version>7.0.28-SNAPSHOT</version>
+ <version>7.0.29-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
Modified: openejb/trunk/openejb/tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/pom.xml?rev=1358841&r1=1358840&r2=1358841&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/pom.xml (original)
+++ openejb/trunk/openejb/tomee/pom.xml Sun Jul 8 21:15:49 2012
@@ -35,6 +35,7 @@
<module>tomee-catalina</module>
<module>tomee-common</module>
<module>tomee-myfaces</module>
+ <module>tomee-mojarra</module>
<module>tomee-webapp</module>
<module>tomee-plus-webapp</module>
<module>tomee-webservices</module>
@@ -43,7 +44,6 @@
<module>tomee-jaxrs-webapp</module>
<module>apache-tomee</module>
<module>apache-tomcat</module>
- <module>tomee-mojarra</module>
</modules>
<repositories>
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1358841&r1=1358840&r2=1358841&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Sun Jul 8 21:15:49 2012
@@ -16,22 +16,15 @@
*/
package org.apache.tomee.catalina;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.deploy.WebXml;
import org.apache.catalina.startup.ContextConfig;
-import org.apache.openejb.assembler.classic.WebAppInfo;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Logger;
import org.xml.sax.InputSource;
-public class OpenEJBContextConfig extends ContextConfig {
+import java.net.URL;
- private static final Logger logger =
Logger.getInstance(LogCategory.OPENEJB.createChild("catalina").createChild("context"),
OpenEJBContextConfig.class);
+public class OpenEJBContextConfig extends ContextConfig {
private TomcatWebAppBuilder.StandardContextInfo info;
@@ -74,9 +67,10 @@ public class OpenEJBContextConfig extend
}
// @Override
- protected void DISABLE_processAnnotationsUrl(URL url, WebXml fragment) {
+ protected void DISABLE_processAnnotationsUrl(URL url, WebXml fragment,
boolean handlesTypesOnly) {
+ /* between t7.0.28 and t7.0.29 the API changed and since we don't use
it simply dont break the build
if (SystemInstance.get().getOptions().get("tomee.tomcat.scan", false))
{
- super.processAnnotationsUrl(url, fragment);
+ super.processAnnotationsUrl(url, fragment, handlesTypesOnly);
return;
}
@@ -85,7 +79,7 @@ public class OpenEJBContextConfig extend
if (webAppInfo == null) {
logger.warning("WebAppInfo not found. " + info);
- super.processAnnotationsUrl(url, fragment);
+ super.processAnnotationsUrl(url, fragment, handlesTypesOnly);
return;
}
@@ -108,7 +102,7 @@ public class OpenEJBContextConfig extend
final InputStream inputStream = classUrl.openStream();
try {
- processAnnotationsStream(inputStream, fragment);
+ processAnnotationsStream(inputStream, fragment,
handlesTypesOnly);
logger.debug("Succeeded " + webAnnotatedClassName);
} catch (IOException e) {
e.printStackTrace();
@@ -120,5 +114,6 @@ public class OpenEJBContextConfig extend
} catch (Exception e) {
logger.error("OpenEJBContextConfig.processAnnotationsUrl:
failed.", e);
}
+ */
}
}
