You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/02/03 08:26:56 UTC
svn commit: r905918 [3/4] - in /geronimo/server/trunk: ./
framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/
framework/configs/geronimo-gbean-deployer/src/main/history/
framework/configs/gshell-geronimo/src/main/history/ framework/co...
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java Wed Feb 3 07:26:50 2010
@@ -37,12 +37,12 @@
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
-import org.apache.geronimo.xbeans.javaee.DescriptionType;
-import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
-import org.apache.geronimo.xbeans.javaee.JndiNameType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefType;
-import org.apache.geronimo.xbeans.javaee.XsdStringType;
+import org.apache.geronimo.xbeans.javaee6.DescriptionType;
+import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee6.JndiNameType;
+import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee6.XsdStringType;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
import org.osgi.framework.Bundle;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java Wed Feb 3 07:26:50 2010
@@ -31,8 +31,8 @@
import org.apache.geronimo.naming.deployment.EnvironmentEntryBuilder;
import org.apache.geronimo.naming.deployment.SwitchingServiceRefBuilder;
import org.apache.geronimo.testsupport.XmlBeansTestSupport;
-import org.apache.geronimo.xbeans.javaee.WebAppDocument;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.WebAppDocument;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
import org.apache.xmlbeans.XmlObject;
import org.apache.xbean.finder.ClassFinder;
import org.apache.xmlbeans.XmlOptions;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java Wed Feb 3 07:26:50 2010
@@ -92,7 +92,7 @@
cursor.removeXml();
}
cursor.pop();
-
+
cursor.push();
while (cursor.hasNextToken()) {
if (cursor.isStart()) {
@@ -105,19 +105,21 @@
cursor.toNextToken();
}
cursor.pop();
-
- cursor.push();
+
+ cursor.push();
Map<Object, List<XmlCursor>> map = createElementMap(cursor);
cursor.pop();
-
+
moveToBottom(cursor, map.get("security-realm-name"));
moveToBottom(cursor, map.get("authentication"));
moveToBottom(cursor, map.get("security"));
moveToBottom(cursor, map.get("gbean"));
+ // Convert Persistent Document
+ convertPersistenceSchemaVersion(cursor, map.get("persistence"));
moveToBottom(cursor, map.get("persistence"));
-
+
clearElementMap(map);
-
+
return webPlan;
} finally {
cursor.dispose();
@@ -130,13 +132,13 @@
rawCursor.dispose();
}
}
-
- private static Map<Object, List<XmlCursor>> createElementMap(XmlCursor cursor) {
- Map<Object, List<XmlCursor>> map = new HashMap<Object, List<XmlCursor>>();
+
+ private static Map<Object, List<XmlCursor>> createElementMap(XmlCursor cursor) {
+ Map<Object, List<XmlCursor>> map = new HashMap<Object, List<XmlCursor>>();
cursor.toStartDoc();
if (cursor.toFirstChild()) {
do {
- QName name = cursor.getName();
+ QName name = cursor.getName();
List<XmlCursor> locations = map.get(name);
if (locations == null) {
locations = new ArrayList<XmlCursor>();
@@ -148,7 +150,7 @@
}
return map;
}
-
+
private static void clearElementMap(Map<Object, List<XmlCursor>> map) {
for (Map.Entry<Object, List<XmlCursor>> entry : map.entrySet()) {
for (XmlCursor cursor : entry.getValue()) {
@@ -157,7 +159,7 @@
}
map.clear();
}
-
+
private static void moveToBottom(XmlCursor cursor, List<XmlCursor> locations) {
if (locations != null) {
for (XmlCursor location : locations) {
@@ -166,5 +168,27 @@
}
}
}
-
+
+ protected void convertPersistenceSchemaVersion(XmlCursor cursor, List<XmlCursor> locations) {
+ if (locations != null) {
+ for (XmlCursor location : locations) {
+ location.push();
+ XmlCursor end = null;
+ try {
+ end = location.newCursor();
+ end.toCursor(location);
+ end.toEndToken();
+ SchemaConversionUtils.convertSchemaVersion(location, end, SchemaConversionUtils.JPA_PERSISTENCE_NAMESPACE, "http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd", "2.0");
+ } finally {
+ if (end != null) {
+ try {
+ end.dispose();
+ } catch (Exception e) {
+ }
+ }
+ location.pop();
+ }
+ }
+ }
+ }
}
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java Wed Feb 3 07:26:50 2010
@@ -36,7 +36,7 @@
*/
public class WebAppDConfigRoot extends DConfigBeanRootSupport {
static final SchemaTypeLoader SCHEMA_TYPE_LOADER = XmlBeans.typeLoaderUnion(new SchemaTypeLoader[]{
- XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.javaee.String.class.getClassLoader()),
+ XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.javaee6.String.class.getClassLoader()),
XmlBeans.typeLoaderForClassLoader(GerWebAppDocument.class.getClassLoader())
});
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java Wed Feb 3 07:26:50 2010
@@ -66,17 +66,17 @@
import org.apache.geronimo.web25.deployment.security.AuthenticationWrapper;
import org.apache.geronimo.web25.deployment.security.SpecSecurityBuilder;
import org.apache.geronimo.xbeans.geronimo.j2ee.GerSecurityDocument;
-import org.apache.geronimo.xbeans.javaee.FilterMappingType;
-import org.apache.geronimo.xbeans.javaee.FilterType;
-import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee.ListenerType;
-import org.apache.geronimo.xbeans.javaee.SecurityConstraintType;
-import org.apache.geronimo.xbeans.javaee.ServletMappingType;
-import org.apache.geronimo.xbeans.javaee.ServletType;
-import org.apache.geronimo.xbeans.javaee.UrlPatternType;
-import org.apache.geronimo.xbeans.javaee.WebAppDocument;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
-import org.apache.geronimo.xbeans.javaee.WebResourceCollectionType;
+import org.apache.geronimo.xbeans.javaee6.FilterMappingType;
+import org.apache.geronimo.xbeans.javaee6.FilterType;
+import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee6.ListenerType;
+import org.apache.geronimo.xbeans.javaee6.SecurityConstraintType;
+import org.apache.geronimo.xbeans.javaee6.ServletMappingType;
+import org.apache.geronimo.xbeans.javaee6.ServletType;
+import org.apache.geronimo.xbeans.javaee6.UrlPatternType;
+import org.apache.geronimo.xbeans.javaee6.WebAppDocument;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.WebResourceCollectionType;
import org.apache.xbean.finder.ClassFinder;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlDocumentProperties;
@@ -357,7 +357,7 @@
URI baseUri = URI.create(module.getTargetPath());
URI resolutionUri = invertURI(baseUri);
earContext.getCompleteManifestClassPath(module.getDeployable(), baseUri, resolutionUri, manifestcp, moduleLocations);
-
+
WebAppType webApp = (WebAppType) module.getSpecDD();
if ((webApp.getSecurityConstraintArray().length > 0 || webApp.getSecurityRoleArray().length > 0)) {
if (!hasSecurityRealmName) {
@@ -395,7 +395,7 @@
}
protected String getSpecDDAsString(WebModule module) {
- StringWriter writer = new StringWriter();
+ StringWriter writer = new StringWriter();
XmlOptions options = new XmlOptions();
QName webQName = new QName("http://java.sun.com/xml/ns/javaee", "web-app");
options.setSaveSyntheticDocumentElement(webQName);
@@ -406,29 +406,21 @@
}
return writer.toString();
}
-
- protected WebAppDocument convertToServletSchema(XmlObject xmlObject) throws XmlException {
- String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
- String version = "2.5";
+ protected WebAppDocument convertToServletSchema(XmlObject xmlObject) throws XmlException {
+ String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ String version = "3.0";
XmlCursor cursor = xmlObject.newCursor();
try {
cursor.toStartDoc();
cursor.toFirstChild();
- if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI())) {
- SchemaConversionUtils.convertSchemaVersion(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version);
- XmlObject result = xmlObject.changeType(WebAppDocument.type);
- XmlBeansUtil.validateDD(result);
- return (WebAppDocument) result;
- }
-
- if ("http://java.sun.com/xml/ns/javaee".equals(cursor.getName().getNamespaceURI())) {
+ String nameSpaceURI = cursor.getName().getNamespaceURI();
+ if ("http://java.sun.com/xml/ns/javaee".equals(nameSpaceURI) || "http://java.sun.com/xml/ns/j2ee".equals(nameSpaceURI)) {
SchemaConversionUtils.convertSchemaVersion(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version);
XmlObject result = xmlObject.changeType(WebAppDocument.type);
XmlBeansUtil.validateDD(result);
return (WebAppDocument) result;
}
-
//otherwise assume DTD
XmlDocumentProperties xmlDocumentProperties = cursor.documentProperties();
String publicId = xmlDocumentProperties.getDoctypePublicId();
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/security/SpecSecurityBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/security/SpecSecurityBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/security/SpecSecurityBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/security/SpecSecurityBuilder.java Wed Feb 3 07:26:50 2010
@@ -35,14 +35,14 @@
import javax.security.jacc.PolicyContextException;
import org.apache.geronimo.security.jacc.ComponentPermissions;
-import org.apache.geronimo.xbeans.javaee.RoleNameType;
-import org.apache.geronimo.xbeans.javaee.SecurityConstraintType;
-import org.apache.geronimo.xbeans.javaee.UrlPatternType;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
-import org.apache.geronimo.xbeans.javaee.WebResourceCollectionType;
-import org.apache.geronimo.xbeans.javaee.SecurityRoleType;
-import org.apache.geronimo.xbeans.javaee.ServletType;
-import org.apache.geronimo.xbeans.javaee.SecurityRoleRefType;
+import org.apache.geronimo.xbeans.javaee6.RoleNameType;
+import org.apache.geronimo.xbeans.javaee6.SecurityConstraintType;
+import org.apache.geronimo.xbeans.javaee6.UrlPatternType;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.WebResourceCollectionType;
+import org.apache.geronimo.xbeans.javaee6.SecurityRoleType;
+import org.apache.geronimo.xbeans.javaee6.ServletType;
+import org.apache.geronimo.xbeans.javaee6.SecurityRoleRefType;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java Wed Feb 3 07:26:50 2010
@@ -46,9 +46,25 @@
private XmlOptions options = new XmlOptions();
private WebModuleBuilder webModuleBuilder = new WebModuleBuilder(null);
- public void testWeb24To25Transform() throws Exception {
+ public void testWeb25To30Transform() throws Exception {
+ URL srcXml = classLoader.getResource("javaee_5schema/web-2-25.xml");
+ URL expectedOutputXml = classLoader.getResource("javaee_6schema/web-2-30.xml");
+ XmlObject xmlObject = XmlObject.Factory.parse(srcXml, options);
+ xmlObject = webModuleBuilder.convertToServletSchema(xmlObject);
+ XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
+ log.debug(xmlObject.toString());
+ log.debug(expected.toString());
+ List problems = new ArrayList();
+ boolean ok = compareXmlObjects(xmlObject, expected, problems);
+ assertTrue("Differences: " + problems, ok);
+ xmlObject = webModuleBuilder.convertToServletSchema(xmlObject);
+ boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
+ assertTrue("Differences: " + problems, ok2);
+ }
+
+ public void testWeb24To30Transform() throws Exception {
URL srcXml = classLoader.getResource("j2ee_1_4schema/web-2-24.xml");
- URL expectedOutputXml = classLoader.getResource("javaee_5schema/web-2-25.xml");
+ URL expectedOutputXml = classLoader.getResource("javaee_6schema/web-2-30.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml, options);
xmlObject = webModuleBuilder.convertToServletSchema(xmlObject);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
@@ -62,9 +78,9 @@
assertTrue("Differences: " + problems, ok2);
}
- public void testWeb23To25Transform() throws Exception {
+ public void testWeb23To30Transform() throws Exception {
URL srcXml = classLoader.getResource("j2ee_1_3dtd/web-23.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/web-25.xml");
+ URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/web-30.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
xmlObject = webModuleBuilder.convertToServletSchema(xmlObject);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
@@ -78,9 +94,9 @@
assertTrue("Differences: " + problems, ok2);
}
- public void testWeb23To25OtherTransform() throws Exception {
+ public void testWeb23To30OtherTransform() throws Exception {
URL srcXml = classLoader.getResource("j2ee_1_3dtd/web-1-23.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/web-1-25.xml");
+ URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/web-1-30.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
xmlObject = webModuleBuilder.convertToServletSchema(xmlObject);
// log.debug(xmlObject.toString());
@@ -93,9 +109,9 @@
assertTrue("Differences: " + problems, ok2);
}
- public void testWeb22To25Transform1() throws Exception {
+ public void testWeb22To30Transform1() throws Exception {
URL srcXml = classLoader.getResource("j2ee_1_2dtd/web-1-22.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_2dtd/web-1-25.xml");
+ URL expectedOutputXml = classLoader.getResource("j2ee_1_2dtd/web-1-30.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
xmlObject = webModuleBuilder.convertToServletSchema(xmlObject);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
@@ -109,19 +125,19 @@
assertTrue("Differences: " + problems, ok2);
}
- public void testWebRejectBad25() throws Exception {
- URL srcXml = classLoader.getResource("javaee_5schema/web-1-25.xml");
+ public void testWebRejectBad30() throws Exception {
+ URL srcXml = classLoader.getResource("javaee_6schema/web-1-30.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
try {
webModuleBuilder.convertToServletSchema(xmlObject);
- fail("doc src/test-data/javaee_5schema/web-1-25.xml is invalid, should not have validated");
+ fail("doc src/test-data/javaee_5schema/web-1-30.xml is invalid, should not have validated");
} catch (XmlException e) {
//expected
}
}
- public void testParseWeb25() throws Exception {
- URL srcXml = classLoader.getResource("javaee_5schema/web-2-25.xml");
+ public void testParseWeb30() throws Exception {
+ URL srcXml = classLoader.getResource("javaee_6schema/web-2-30.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
webModuleBuilder.convertToServletSchema(xmlObject);
}
@@ -135,7 +151,7 @@
public Module createModule(Bundle bundle, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
return null;
}
-
+
protected Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, boolean standAlone, String contextRoot, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
return null;
}
@@ -149,7 +165,7 @@
public String getSchemaNamespace() {
return null;
}
-
+
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/security/SecurityConfigTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/security/SecurityConfigTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/security/SecurityConfigTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/security/SecurityConfigTest.java Wed Feb 3 07:26:50 2010
@@ -21,8 +21,8 @@
import org.apache.geronimo.security.jacc.ComponentPermissions;
import org.apache.geronimo.testsupport.TestSupport;
-import org.apache.geronimo.xbeans.javaee.WebAppDocument;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.WebAppDocument;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
import org.apache.xmlbeans.XmlOptions;
/**
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/security/SpecSecurityParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/security/SpecSecurityParsingTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/security/SpecSecurityParsingTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/security/SpecSecurityParsingTest.java Wed Feb 3 07:26:50 2010
@@ -41,8 +41,8 @@
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.kernel.Naming;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
-import org.apache.geronimo.xbeans.javaee.WebAppDocument;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.WebAppDocument;
import org.apache.geronimo.security.jacc.ComponentPermissions;
import org.apache.geronimo.web25.deployment.AbstractWebModuleBuilder;
import org.apache.xmlbeans.XmlOptions;
Added: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-30.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-30.xml?rev=905918&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-30.xml (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-30.xml Wed Feb 3 07:26:50 2010
@@ -0,0 +1,35 @@
+<?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.
+-->
+<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+ <description>no description</description>
+ <display-name>display name</display-name>
+ <servlet>
+ <description>no description</description>
+ <display-name>servlet display name</display-name>
+ <servlet-name>servletname</servlet-name>
+ <servlet-class>com.nowhere.Servlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>servletname</servlet-name>
+ <url-pattern>/urlPattern</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout>
+ </session-config>
+</web-app>
+
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-30.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-30.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-30.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-30.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-30.xml?rev=905918&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-30.xml (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-30.xml Wed Feb 3 07:26:50 2010
@@ -0,0 +1,52 @@
+<!--
+ 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.
+-->
+<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+ <servlet>
+ <description>MVC Servlet for Jetspeed Portlet Applications</description>
+ <display-name>Jetspeed Container</display-name>
+ <servlet-name>JetspeedContainer</servlet-name>
+ <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+ <init-param>
+ <param-name>registerAtInit</param-name>
+ <param-value>1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>portletApplication</param-name>
+ <param-value>RssPortlet-enhanced</param-value>
+ </init-param>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
+ <servlet>
+ <description>MVC Servlet for Jetspeed Portlet Applications</description>
+ <display-name>Jetspeed Container</display-name>
+ <servlet-name>JetspeedContainer2</servlet-name>
+ <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+ <init-param>
+ <param-name>registerAtInit</param-name>
+ <param-value>1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>portletApplication</param-name>
+ <param-value>RssPortlet-enhanced</param-value>
+ </init-param>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>JetspeedContainer</servlet-name>
+ <url-pattern>/container/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-30.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-30.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-30.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-30.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-30.xml?rev=905918&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-30.xml (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-30.xml Wed Feb 3 07:26:50 2010
@@ -0,0 +1,139 @@
+<!--
+ 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.
+-->
+<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+ <description>WebAppDescription</description>
+ <display-name>WebAppDisplayName</display-name>
+ <icon>
+ <small-icon>small</small-icon>
+ <large-icon>large</large-icon>
+ </icon>
+ <distributable/>
+ <context-param>
+ <description>description1</description>
+ <param-name>param1</param-name>
+ <param-value>value1</param-value>
+ </context-param>
+ <context-param>
+ <description>description2</description>
+ <param-name>param2</param-name>
+ <param-value>value2</param-value>
+ </context-param>
+ <filter>
+ <description>filterDescription</description>
+ <display-name>displayName</display-name>
+ <icon>
+ <small-icon>small</small-icon>
+ <large-icon>large</large-icon>
+ </icon>
+ <filter-name>filterName</filter-name>
+ <filter-class>MyClass</filter-class>
+ <init-param>
+ <description>initDescription</description>
+ <param-name>paramName</param-name>
+ <param-value>value</param-value>
+ </init-param>
+ </filter>
+ <servlet>
+ <description>ServletDescription</description>
+ <display-name>servletDisplayName</display-name>
+ <icon>
+ <small-icon>smallServlet</small-icon>
+ <large-icon>largeServlet</large-icon>
+ </icon>
+ <servlet-name>myServlet</servlet-name>
+ <servlet-class>MyServletClass</servlet-class>
+ <init-param>
+ <description>description</description>
+ <param-name>paramName</param-name>
+ <param-value>value</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ <run-as>
+ <role-name>me</role-name>
+ </run-as>
+ </servlet>
+ <servlet>
+ <description>ServletDescription</description>
+ <display-name>servletDisplayName</display-name>
+ <servlet-name>myOtherServlet</servlet-name>
+ <servlet-class>MyServletClass</servlet-class>
+ <init-param>
+ <description>description</description>
+ <param-name>paramName</param-name>
+ <param-value>value</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ <run-as>
+ <role-name>me</role-name>
+ </run-as>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>LoginServlet</servlet-name>
+ <url-pattern>/login</url-pattern>
+ </servlet-mapping>
+ <jsp-config>
+ <taglib>
+ <taglib-uri>/WEB-INF/tld/struts-bean.tld</taglib-uri>
+ <taglib-location>/WEB-INF/tld/struts-bean-1.1.tld</taglib-location>
+ </taglib>
+ <taglib>
+ <taglib-uri>/WEB-INF/tld/struts-html.tld</taglib-uri>
+ <taglib-location>/WEB-INF/tld/struts-html-1.1.tld</taglib-location>
+ </taglib>
+ <taglib>
+ <taglib-uri>/WEB-INF/tld/struts-logic.tld</taglib-uri>
+ <taglib-location>/WEB-INF/tld/struts-logic-1.1.tld</taglib-location>
+ </taglib>
+ <taglib>
+ <taglib-uri>/WEB-INF/tld/struts-tiles.tld</taglib-uri>
+ <taglib-location>/WEB-INF/tld/struts-tiles-1.1.tld</taglib-location>
+ </taglib>
+ </jsp-config>
+ <servlet-mapping>
+ <servlet-name>LoginServlet</servlet-name>
+ <url-pattern>/login-error</url-pattern>
+ </servlet-mapping>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Secured Content</web-resource-name>
+ <description>Require users to authenticate</description>
+ <url-pattern>/secure/*</url-pattern>
+ <url-pattern>/servlets/*</url-pattern>
+ <http-method>POST</http-method>
+ <http-method>GET</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <description>Only allow Authenticated Users role</description>
+ <role-name>Users</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <description>Encryption is not required for the application in general.</description>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <login-config>
+ <auth-method>FORM</auth-method>
+ <form-login-config>
+ <form-login-page>/login</form-login-page>
+ <form-error-page>/login-error</form-error-page>
+ </form-login-config>
+ </login-config>
+ <security-role>
+ <description>Users</description>
+ <role-name>Users</role-name>
+ </security-role>
+</web-app>
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-30.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-30.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-30.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-1-30.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-1-30.xml?rev=905918&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-1-30.xml (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-1-30.xml Wed Feb 3 07:26:50 2010
@@ -0,0 +1,53 @@
+<?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.
+-->
+<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+ <servlet>
+ <display-name>Jetspeed Container</display-name>
+ <description>MVC Servlet for Jetspeed Portlet Applications</description>
+ <servlet-name>JetspeedContainer</servlet-name>
+ <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+ <init-param>
+ <param-name>registerAtInit</param-name>
+ <param-value>1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>portletApplication</param-name>
+ <param-value>RssPortlet-enhanced</param-value>
+ </init-param>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
+ <servlet>
+ <display-name>Jetspeed Container</display-name>
+ <description>MVC Servlet for Jetspeed Portlet Applications</description>
+ <servlet-name>JetspeedContainer2</servlet-name>
+ <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+ <init-param>
+ <param-name>registerAtInit</param-name>
+ <param-value>1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>portletApplication</param-name>
+ <param-value>RssPortlet-enhanced</param-value>
+ </init-param>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>JetspeedContainer</servlet-name>
+ <url-pattern>/container/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-1-30.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-1-30.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-1-30.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-2-30.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-2-30.xml?rev=905918&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-2-30.xml (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-2-30.xml Wed Feb 3 07:26:50 2010
@@ -0,0 +1,36 @@
+<?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.
+-->
+<web-app version="3.0" 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/j2ee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ <display-name>naming itest</display-name>
+ <servlet>
+ <servlet-name>NamingTestServlet</servlet-name>
+ <servlet-class>org.apache.geronimo.itests.naming.war.NamingTestServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>NamingTestServlet</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+
+ <service-ref>
+ <service-ref-name>service/InteropLab</service-ref-name>
+ <service-interface>org.apache.geronimo.itests.naming.common.webservice.interop.InteropLab</service-interface>
+ <wsdl-file>WEB-INF/wsdl/interop.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/wsdl/interop-jaxrpcmapping.xml</jaxrpc-mapping-file>
+ <service-qname xmlns:interop="http://tempuri.org/4s4c/1/3/wsdl/def/interopLab">interop:interopLab</service-qname>
+ </service-ref>
+</web-app>
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-2-30.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-2-30.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-2-30.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml Wed Feb 3 07:26:50 2010
@@ -66,6 +66,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java Wed Feb 3 07:26:50 2010
@@ -62,14 +62,12 @@
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.geronimo.web25.deployment.AbstractWebModuleBuilder;
-import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee.JspConfigType;
-import org.apache.geronimo.xbeans.javaee.ListenerType;
import org.apache.geronimo.xbeans.javaee.TagType;
import org.apache.geronimo.xbeans.javaee.TaglibDocument;
-import org.apache.geronimo.xbeans.javaee.TaglibType;
import org.apache.geronimo.xbeans.javaee.TldTaglibType;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.JspConfigType;
+import org.apache.geronimo.xbeans.javaee6.TaglibType;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
import org.apache.xbean.finder.ClassFinder;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
@@ -90,7 +88,7 @@
public class JspModuleBuilderExtension implements ModuleBuilderExtension {
private static final Logger log = LoggerFactory.getLogger(JspModuleBuilderExtension.class);
-
+
private static final QName TLIB_VERSION = new QName(SchemaConversionUtils.JAVAEE_NAMESPACE, "tlib-version");
private static final QName SHORT_NAME = new QName(SchemaConversionUtils.JAVAEE_NAMESPACE, "short-name");
private static final QName TAG_CLASS = new QName(SchemaConversionUtils.JAVAEE_NAMESPACE, "tag-class");
@@ -262,7 +260,7 @@
throw new DeploymentException("Could not locate TLD files located in META-INF(s) " + ioe.getMessage(), ioe);
}
*/
-
+
log.debug("getTldFiles() Exit: URL[" + tldURLs.size() + "]: " + tldURLs.toString());
return tldURLs;
}
@@ -318,9 +316,9 @@
TldTaglibType tl = tld.getTaglib();
// Get all the listeners from the TLD file
- ListenerType[] listeners = tl.getListenerArray();
- for (ListenerType listener : listeners) {
- FullyQualifiedClassType cls = listener.getListenerClass();
+ org.apache.geronimo.xbeans.javaee.ListenerType[] listeners = tl.getListenerArray();
+ for (org.apache.geronimo.xbeans.javaee.ListenerType listener : listeners) {
+ org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType cls = listener.getListenerClass();
String className = cls.getStringValue().trim();
listenerNames.add(className);
try {
@@ -335,7 +333,7 @@
// Get all the tags from the TLD file
TagType[] tags = tl.getTagArray();
for (TagType tag : tags) {
- FullyQualifiedClassType cls = tag.getTagClass();
+ org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType cls = tag.getTagClass();
String className = cls.getStringValue().trim();
try {
Class clas = bundle.loadClass(className);
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/AdvancedWARWebServiceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/AdvancedWARWebServiceFinder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/AdvancedWARWebServiceFinder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/AdvancedWARWebServiceFinder.java Wed Feb 3 07:26:50 2010
@@ -28,9 +28,9 @@
import org.apache.geronimo.j2ee.deployment.WebModule;
import org.apache.geronimo.jaxws.JAXWSUtils;
import org.apache.geronimo.jaxws.PortInfo;
-import org.apache.geronimo.xbeans.javaee.ServletMappingType;
-import org.apache.geronimo.xbeans.javaee.ServletType;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.ServletMappingType;
+import org.apache.geronimo.xbeans.javaee6.ServletType;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.osgi.framework.Bundle;
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java Wed Feb 3 07:26:50 2010
@@ -51,7 +51,7 @@
import org.apache.geronimo.xbeans.geronimo.naming.GerPortPropertyType;
import org.apache.geronimo.xbeans.geronimo.naming.GerPortType;
import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
-import org.apache.geronimo.xbeans.javaee.PortComponentRefType;
+import org.apache.geronimo.xbeans.javaee6.PortComponentRefType;
import org.apache.xml.resolver.Catalog;
import org.apache.xml.resolver.CatalogManager;
import org.apache.xml.resolver.tools.CatalogResolver;
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java Wed Feb 3 07:26:50 2010
@@ -28,8 +28,6 @@
import javax.xml.ws.Service;
import javax.xml.ws.handler.Handler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.jaxws.HandlerChainsUtils;
@@ -38,17 +36,17 @@
import org.apache.geronimo.naming.deployment.ServiceRefBuilder;
import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
-import org.apache.geronimo.xbeans.javaee.PortComponentRefType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefHandlerChainType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefHandlerChainsType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefHandlerType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefType;
-
+import org.apache.geronimo.xbeans.javaee6.HandlerChainType;
+import org.apache.geronimo.xbeans.javaee6.HandlerChainsType;
+import org.apache.geronimo.xbeans.javaee6.HandlerType;
+import org.apache.geronimo.xbeans.javaee6.PortComponentRefType;
+import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
-
import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class JAXWSServiceRefBuilder extends AbstractNamingBuilder implements ServiceRefBuilder {
private static final Logger log = LoggerFactory.getLogger(JAXWSServiceRefBuilder.class);
@@ -137,9 +135,9 @@
}
if (serviceRef.isSetHandlerChains()) {
- ServiceRefHandlerChainsType handlerChains = serviceRef.getHandlerChains();
- for (ServiceRefHandlerChainType handlerChain : handlerChains.getHandlerChainArray()) {
- for (ServiceRefHandlerType handler : handlerChain.getHandlerArray()) {
+ HandlerChainsType handlerChains = serviceRef.getHandlerChains();
+ for (HandlerChainType handlerChain : handlerChains.getHandlerChainArray()) {
+ for (HandlerType handler : handlerChain.getHandlerArray()) {
String handlerClassName = getStringValue(handler.getHandlerClass());
Class handlerClass = loadClass(handlerClassName, bundle, "handler");
if (!Handler.class.isAssignableFrom(handlerClass)) {
@@ -195,7 +193,7 @@
return GER_SERVICE_REF_QNAME_SET;
}
- public static String getHandlerChainAsString(ServiceRefHandlerChainsType handlerChains)
+ public static String getHandlerChainAsString(HandlerChainsType handlerChains)
throws IOException {
String xml = null;
if (handlerChains != null) {
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/SimpleWARWebServiceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/SimpleWARWebServiceFinder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/SimpleWARWebServiceFinder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/SimpleWARWebServiceFinder.java Wed Feb 3 07:26:50 2010
@@ -26,9 +26,9 @@
import org.apache.geronimo.j2ee.deployment.WebModule;
import org.apache.geronimo.jaxws.JAXWSUtils;
import org.apache.geronimo.jaxws.PortInfo;
-import org.apache.geronimo.xbeans.javaee.ServletMappingType;
-import org.apache.geronimo.xbeans.javaee.ServletType;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.ServletMappingType;
+import org.apache.geronimo.xbeans.javaee6.ServletType;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Wed Feb 3 07:26:50 2010
@@ -102,6 +102,11 @@
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/HandlerChainsUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/HandlerChainsUtils.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/HandlerChainsUtils.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/HandlerChainsUtils.java Wed Feb 3 07:26:50 2010
@@ -31,9 +31,9 @@
public class HandlerChainsUtils {
- public static final QName HANDLER_CHAINS_QNAME =
+ public static final QName HANDLER_CHAINS_QNAME =
new QName("http://java.sun.com/xml/ns/javaee", "handler-chains");
-
+
private HandlerChainsUtils() {
}
@@ -50,8 +50,8 @@
}
return handlerChains;
}
-
- public static HandlerChainsType getHandlerChains(String xml) throws XmlException {
+
+ public static HandlerChainsType getHandlerChains(String xml) throws XmlException {
HandlerChainsType types = null;
if (xml != null) {
try {
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java Wed Feb 3 07:26:50 2010
@@ -66,7 +66,7 @@
if (null == handlerChainsType || handlerChainsType.getHandlerChainArray() == null) {
throw new WebServiceException("Chain not specified");
}
-
+
chain = new ArrayList<Handler>();
for (HandlerChainType hc : handlerChainsType.getHandlerChainArray()) {
chain.addAll(buildHandlerChain(hc, clz.getClassLoader()));
@@ -76,7 +76,7 @@
throw new WebServiceException("Chain not specified", e);
}
}
-
+
assert chain != null;
if (existingHandlers != null) {
chain.addAll(existingHandlers);
@@ -88,7 +88,7 @@
return buildHandlerChainFromClass(clz, null);
}
- private HandlerChainAnnotation findHandlerChainAnnotation(Class<?> clz, boolean searchSEI) {
+ private HandlerChainAnnotation findHandlerChainAnnotation(Class<?> clz, boolean searchSEI) {
if (log.isDebugEnabled()) {
log.debug("Checking for HandlerChain annotation on " + clz.getName());
}
@@ -97,17 +97,17 @@
if (ann == null) {
if (searchSEI) {
/* HandlerChain annotation can be specified on the SEI
- * but the implementation bean might not implement the SEI.
+ * but the implementation bean might not implement the SEI.
*/
WebService ws = clz.getAnnotation(WebService.class);
- if (ws != null
- && ws.endpointInterface() != null
+ if (ws != null
+ && ws.endpointInterface() != null
&& ws.endpointInterface().trim().length() > 0) {
String seiClassName = ws.endpointInterface().trim();
Class seiClass = null;
try {
seiClass = clz.getClassLoader().loadClass(seiClassName);
- } catch (ClassNotFoundException e) {
+ } catch (ClassNotFoundException e) {
throw new WebServiceException("Failed to load SEI class: " + seiClassName, e);
}
@@ -131,10 +131,10 @@
} else {
hcAnn = new HandlerChainAnnotation(ann, clz);
}
-
+
return hcAnn;
}
-
+
protected List<Handler> buildHandlerChain(HandlerChainType hc, ClassLoader classLoader) {
List<Handler> handlerChain = new ArrayList<Handler>();
for (PortComponentHandlerType ht : hc.getHandlerArray()) {
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java Wed Feb 3 07:26:50 2010
@@ -37,7 +37,7 @@
*/
public class GeronimoHandlerChainBuilder extends AnnotationHandlerChainBuilder {
private static final Logger log = LoggerFactory.getLogger(GeronimoHandlerChainBuilder.class);
-
+
private ClassLoader classLoader = null;
private PortInfo portInfo;
@@ -62,9 +62,9 @@
}
}
- private boolean matchServiceName(PortInfo info, HandlerChainType hc) {
+ private boolean matchServiceName(PortInfo info, HandlerChainType hc) {
if (hc.isSetServiceNamePattern()) {
- QName serviceName = (info == null) ? null : info.getServiceName();
+ QName serviceName = (info == null) ? null : info.getServiceName();
return match(hc.xgetServiceNamePattern().newCursor(), serviceName, hc.getServiceNamePattern());
} else {
// handler matches since no service-name-pattern
@@ -74,7 +74,7 @@
private boolean matchPortName(PortInfo info, HandlerChainType hc) {
if (hc.isSetPortNamePattern()) {
- QName portName = (info == null) ? null : info.getPortName();
+ QName portName = (info == null) ? null : info.getPortName();
return match(hc.xgetPortNamePattern().newCursor(), portName, hc.getPortNamePattern());
} else {
// handler maches no port-name-pattern
@@ -102,18 +102,18 @@
return true;
}
}
- return false;
+ return false;
}
}
}
-
+
public List<Handler> buildHandlerChainFromConfiguration(HandlerChainType hc) {
if (null == hc) {
return null;
}
return sortHandlers(buildHandlerChain(hc, getHandlerClassLoader()));
}
-
+
/*
* Performs basic localName matching, namespaces are not checked!
*/
@@ -130,21 +130,21 @@
int pos = namePattern.indexOf(':');
if (pos == -1) {
localNamePattern = namePattern;
- } else {
+ } else {
localNamePattern = namePattern.substring(pos + 1);
-
+
String prefix = namePattern.substring(0, pos);
String namespace = node.namespaceForPrefix(prefix.trim());
if (namespace == null) {
namespace = prefix;
}
-
+
// check namespace
if (!namespace.equals(name.getNamespaceURI())) {
return false;
}
}
-
+
// check local name
localNamePattern = localNamePattern.trim();
if (localNamePattern.contains("*")) {
@@ -152,7 +152,7 @@
Pattern pattern = Pattern.compile(localNamePattern.replace("*", "(\\w|\\.|-|_)*"));
Matcher matcher = pattern.matcher(name.getLocalPart());
return matcher.matches();
- } else {
+ } else {
return localNamePattern.equals(name.getLocalPart());
}
}
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolverTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolverTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolverTest.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolverTest.java Wed Feb 3 07:26:50 2010
@@ -31,15 +31,15 @@
public void testBasic() throws Exception {
InputStream in = getClass().getResourceAsStream("/handlers.xml");
assertTrue(in != null);
- HandlerChainsType handlerChains = toHandlerChains(in);
+ HandlerChainsType handlerChains = toHandlerChains(in);
assertEquals(3, handlerChains.getHandlerChainArray().length);
-
- GeronimoHandlerResolver resolver =
+
+ GeronimoHandlerResolver resolver =
new GeronimoHandlerResolver(getClass().getClassLoader(), getClass(), handlerChains, null);
-
+
List<Handler> handlers = null;
-
- handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
+
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
assertEquals(3, handlers.size());
}
@@ -48,138 +48,138 @@
assertTrue(in != null);
HandlerChainsType handlerChains = toHandlerChains(in);
assertEquals(4, handlerChains.getHandlerChainArray().length);
-
- GeronimoHandlerResolver resolver =
+
+ GeronimoHandlerResolver resolver =
new GeronimoHandlerResolver(getClass().getClassLoader(), getClass(), handlerChains, null);
-
+
List<Handler> handlers = null;
-
- handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
+
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
assertEquals(0, handlers.size());
-
+
QName serviceName1 = new QName("http://foo", "Bar");
- handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName1));
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName1));
assertEquals(1, handlers.size());
-
+
QName serviceName2 = new QName("http://foo", "Foo");
- handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName2));
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName2));
assertEquals(2, handlers.size());
-
+
QName serviceName3 = new QName("http://foo", "FooBar");
- handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName3));
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName3));
assertEquals(1, handlers.size());
-
+
QName serviceName4 = new QName("http://foo", "BarFoo");
- handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName4));
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName4));
assertEquals(0, handlers.size());
-
+
QName serviceName5 = new QName("https://foo", "Bar");
- handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName5));
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName5));
assertEquals(1, handlers.size());
}
-
+
public void testBindingMatching() throws Exception {
InputStream in = getClass().getResourceAsStream("/handlers_bindings.xml");
assertTrue(in != null);
- HandlerChainsType handlerChains = toHandlerChains(in);
+ HandlerChainsType handlerChains = toHandlerChains(in);
assertEquals(4, handlerChains.getHandlerChainArray().length);
-
- GeronimoHandlerResolver resolver =
+
+ GeronimoHandlerResolver resolver =
new GeronimoHandlerResolver(getClass().getClassLoader(), getClass(), handlerChains, null);
-
+
List<Handler> handlers = null;
-
- handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
+
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
assertEquals(0, handlers.size());
-
+
handlers = resolver.getHandlerChain(new TestPortInfo("http://foobar", null, null));
assertEquals(0, handlers.size());
- handlers = resolver.getHandlerChain(new TestPortInfo("##SOAP12_HTTP", null, null));
+ handlers = resolver.getHandlerChain(new TestPortInfo("##SOAP12_HTTP", null, null));
assertEquals(0, handlers.size());
-
- handlers = resolver.getHandlerChain(new TestPortInfo("##SOAP11_HTTP", null, null));
+
+ handlers = resolver.getHandlerChain(new TestPortInfo("##SOAP11_HTTP", null, null));
assertEquals(2, handlers.size());
-
+
handlers = resolver.getHandlerChain(new TestPortInfo("http://schemas.xmlsoap.org/wsdl/soap/http", null, null));
assertEquals(2, handlers.size());
- handlers = resolver.getHandlerChain(new TestPortInfo("##SOAP11_HTTP_MTOM", null, null));
+ handlers = resolver.getHandlerChain(new TestPortInfo("##SOAP11_HTTP_MTOM", null, null));
assertEquals(1, handlers.size());
-
+
handlers = resolver.getHandlerChain(new TestPortInfo("##XML_HTTP", null, null));
assertEquals(2, handlers.size());
}
-
+
public void testPortMatching() throws Exception {
InputStream in = getClass().getResourceAsStream("/handlers_port.xml");
assertTrue(in != null);
- HandlerChainsType handlerChains = toHandlerChains(in);
+ HandlerChainsType handlerChains = toHandlerChains(in);
assertEquals(4, handlerChains.getHandlerChainArray().length);
-
- GeronimoHandlerResolver resolver =
+
+ GeronimoHandlerResolver resolver =
new GeronimoHandlerResolver(getClass().getClassLoader(), getClass(), handlerChains, null);
-
+
List<Handler> handlers = null;
-
- handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
+
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
assertEquals(0, handlers.size());
-
+
QName portName1 = new QName("http://foo", "Bar");
- handlers = resolver.getHandlerChain(new TestPortInfo(null, portName1, null));
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, portName1, null));
assertEquals(1, handlers.size());
-
+
QName portName2 = new QName("http://foo", "Foo");
- handlers = resolver.getHandlerChain(new TestPortInfo(null, portName2, null));
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, portName2, null));
assertEquals(2, handlers.size());
-
+
QName portName3 = new QName("http://foo", "FooBar");
handlers = resolver.getHandlerChain(new TestPortInfo(null, portName3, null));
assertEquals(1, handlers.size());
-
+
QName portName4 = new QName("http://foo", "BarFoo");
- handlers = resolver.getHandlerChain(new TestPortInfo(null, portName4, null));
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, portName4, null));
assertEquals(0, handlers.size());
-
+
QName portName5 = new QName("https://foo", "Bar");
- handlers = resolver.getHandlerChain(new TestPortInfo(null, portName5, null));
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, portName5, null));
assertEquals(1, handlers.size());
}
-
+
public void testMixedMatching() throws Exception {
InputStream in = getClass().getResourceAsStream("/handlers_mixed.xml");
assertTrue(in != null);
- HandlerChainsType handlerChains = toHandlerChains(in);
+ HandlerChainsType handlerChains = toHandlerChains(in);
assertEquals(3, handlerChains.getHandlerChainArray().length);
-
- GeronimoHandlerResolver resolver =
+
+ GeronimoHandlerResolver resolver =
new GeronimoHandlerResolver(getClass().getClassLoader(), getClass(), handlerChains, null);
-
+
List<Handler> handlers = null;
-
- handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
+
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
assertEquals(0, handlers.size());
-
+
QName serviceName1 = new QName("http://foo", "Bar");
QName portName1 = new QName("http://foo", "FooBar");
String binding1 = "##XML_HTTP";
- handlers = resolver.getHandlerChain(new TestPortInfo(binding1, portName1, serviceName1));
+ handlers = resolver.getHandlerChain(new TestPortInfo(binding1, portName1, serviceName1));
assertEquals(3, handlers.size());
-
+
String binding2 = "##SOAP11_HTTP";
- handlers = resolver.getHandlerChain(new TestPortInfo(binding2, portName1, serviceName1));
+ handlers = resolver.getHandlerChain(new TestPortInfo(binding2, portName1, serviceName1));
assertEquals(2, handlers.size());
-
+
QName serviceName2 = new QName("http://foo", "Baaz");
QName portName2 = new QName("http://foo", "Baaz");
- handlers = resolver.getHandlerChain(new TestPortInfo(binding1, portName2, serviceName2));
+ handlers = resolver.getHandlerChain(new TestPortInfo(binding1, portName2, serviceName2));
assertEquals(1, handlers.size());
}
-
+
private static HandlerChainsType toHandlerChains(InputStream input) throws Exception {
return HandlerChainsDocument.Factory.parse(input).getHandlerChains();
}
-
+
private static class TestPortInfo implements PortInfo {
private String bindingID;
@@ -191,7 +191,7 @@
this.portName = portName;
this.serviceName = serviceName;
}
-
+
public String getBindingID() {
return this.bindingID;
}
@@ -203,7 +203,7 @@
public QName getServiceName() {
return this.serviceName;
}
-
+
}
-
+
}
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java Wed Feb 3 07:26:50 2010
@@ -73,7 +73,7 @@
import org.apache.geronimo.xbeans.geronimo.web.jetty.JettyWebAppDocument;
import org.apache.geronimo.xbeans.geronimo.web.jetty.JettyWebAppType;
import org.apache.geronimo.xbeans.geronimo.web.jetty.config.GerJettyDocument;
-import org.apache.geronimo.xbeans.javaee.*;
+import org.apache.geronimo.xbeans.javaee6.*;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.osgi.framework.Bundle;
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/test/java/org/apache/geronimo/jetty8/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/test/java/org/apache/geronimo/jetty8/deployment/PlanParsingTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/test/java/org/apache/geronimo/jetty8/deployment/PlanParsingTest.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/test/java/org/apache/geronimo/jetty8/deployment/PlanParsingTest.java Wed Feb 3 07:26:50 2010
@@ -51,8 +51,8 @@
import org.apache.geronimo.xbeans.geronimo.web.jetty.JettyWebAppDocument;
import org.apache.geronimo.xbeans.geronimo.web.jetty.JettyWebAppType;
import org.apache.geronimo.xbeans.geronimo.web.jetty.config.GerJettyDocument;
-import org.apache.geronimo.xbeans.javaee.WebAppDocument;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.WebAppDocument;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/test/java/org/apache/geronimo/jetty8/deployment/StartupOrderComparatorTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/test/java/org/apache/geronimo/jetty8/deployment/StartupOrderComparatorTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/test/java/org/apache/geronimo/jetty8/deployment/StartupOrderComparatorTest.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/test/java/org/apache/geronimo/jetty8/deployment/StartupOrderComparatorTest.java Wed Feb 3 07:26:50 2010
@@ -17,7 +17,7 @@
package org.apache.geronimo.jetty8.deployment;
import junit.framework.TestCase;
-import org.apache.geronimo.xbeans.javaee.ServletType;
+import org.apache.geronimo.xbeans.javaee6.ServletType;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/src/test/java/org/apache/geronimo/monitoring/console/GeneralSTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/src/test/java/org/apache/geronimo/monitoring/console/GeneralSTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/src/test/java/org/apache/geronimo/monitoring/console/GeneralSTest.java (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/src/test/java/org/apache/geronimo/monitoring/console/GeneralSTest.java Wed Feb 3 07:26:50 2010
@@ -25,7 +25,7 @@
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class GeneralSTest extends SeleneseTestCase {
public void setUp() throws Exception {
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/PopUpGraphServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/PopUpGraphServlet.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/PopUpGraphServlet.java (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/PopUpGraphServlet.java Wed Feb 3 07:26:50 2010
@@ -38,7 +38,7 @@
import org.apache.geronimo.monitoring.console.data.Graph;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class PopUpGraphServlet extends GenericServlet {
@Resource
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/View.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/View.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/View.java (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/View.java Wed Feb 3 07:26:50 2010
@@ -33,7 +33,7 @@
import javax.persistence.GeneratedValue;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
@Entity(name="mview")
@NamedQuery(name = "allViews", query = "SELECT a FROM mview a")
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java Wed Feb 3 07:26:50 2010
@@ -53,12 +53,12 @@
import org.apache.geronimo.security.deployment.SecurityConfiguration;
import org.apache.geronimo.security.jacc.ComponentPermissions;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
-import org.apache.geronimo.xbeans.javaee.EjbJarType;
-import org.apache.geronimo.xbeans.javaee.EnterpriseBeansType;
-import org.apache.geronimo.xbeans.javaee.EntityBeanType;
-import org.apache.geronimo.xbeans.javaee.MessageDrivenBeanType;
-import org.apache.geronimo.xbeans.javaee.ResourceRefType;
-import org.apache.geronimo.xbeans.javaee.SessionBeanType;
+import org.apache.geronimo.xbeans.javaee6.EjbJarType;
+import org.apache.geronimo.xbeans.javaee6.EnterpriseBeansType;
+import org.apache.geronimo.xbeans.javaee6.EntityBeanType;
+import org.apache.geronimo.xbeans.javaee6.MessageDrivenBeanType;
+import org.apache.geronimo.xbeans.javaee6.ResourceRefType;
+import org.apache.geronimo.xbeans.javaee6.SessionBeanType;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.EntityBean;
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Wed Feb 3 07:26:50 2010
@@ -75,7 +75,7 @@
import org.apache.geronimo.persistence.PersistenceUnitGBean;
import org.apache.geronimo.security.jacc.ComponentPermissions;
import org.apache.geronimo.xbeans.geronimo.j2ee.GerSecurityDocument;
-import org.apache.geronimo.xbeans.javaee.EjbJarType;
+import org.apache.geronimo.xbeans.javaee6.EjbJarType;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.*;
import org.apache.openejb.config.AppModule;
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java Wed Feb 3 07:26:50 2010
@@ -41,9 +41,9 @@
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.naming.deployment.AbstractNamingBuilder;
import org.apache.geronimo.openejb.ClientEjbReference;
-import org.apache.geronimo.xbeans.javaee.EjbLocalRefType;
-import org.apache.geronimo.xbeans.javaee.EjbRefType;
-import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee6.EjbLocalRefType;
+import org.apache.geronimo.xbeans.javaee6.EjbRefType;
+import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;