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/04/13 09:21:06 UTC
svn commit: r933505 - in
/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src:
main/java/org/apache/geronimo/myfaces/deployment/ test/resources/1_0_dtd/
Author: xuhaihong
Date: Tue Apr 13 07:21:05 2010
New Revision: 933505
URL: http://svn.apache.org/viewvc?rev=933505&view=rev
Log:
GERONIMO-4815 Update MyFace integration codes due to scheme update
Modified:
geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-complex-expected.xml
geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-empty-expected.xml
geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-moderate-expected.xml
geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-simple-expected.xml
Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java?rev=933505&r1=933504&r2=933505&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java Tue Apr 13 07:21:05 2010
@@ -81,8 +81,8 @@ public class MyFacesModuleBuilderExtensi
private final NamingBuilder namingBuilders;
private static final String CONTEXT_LISTENER_NAME = StartupServletContextListener.class.getName();
private static final String FACES_SERVLET_NAME = FacesServlet.class.getName();
- private static final String SCHEMA_LOCATION_URL = "http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd";
- private static final String VERSION = "1.2";
+ private static final String SCHEMA_LOCATION_URL = "http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd";
+ private static final String VERSION = "2.0";
public MyFacesModuleBuilderExtension(Environment defaultEnvironment, AbstractNameQuery providerFactoryNameQuery, NamingBuilder namingBuilders) {
@@ -94,7 +94,7 @@ public class MyFacesModuleBuilderExtensi
public void createModule(Module module, Bundle bundle, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
mergeEnvironment(module);
}
-
+
public void createModule(Module module, Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
mergeEnvironment(module);
}
@@ -110,9 +110,9 @@ public class MyFacesModuleBuilderExtensi
return;
}
- EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
+ EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
}
-
+
public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
}
@@ -301,27 +301,25 @@ public class MyFacesModuleBuilderExtensi
try {
cursor.toStartDoc();
cursor.toFirstChild();
- if (SchemaConversionUtils.JAVAEE_NAMESPACE.equals(cursor.getName().getNamespaceURI())) {
- //do nothing
- } else if (SchemaConversionUtils.J2EE_NAMESPACE.equals(cursor.getName().getNamespaceURI())) {
+ String nameSpaceURI = cursor.getName().getNamespaceURI();
+ if (SchemaConversionUtils.JAVAEE_NAMESPACE.equals(nameSpaceURI) || SchemaConversionUtils.J2EE_NAMESPACE.equals(nameSpaceURI)) {
SchemaConversionUtils.convertSchemaVersion(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, SCHEMA_LOCATION_URL, VERSION);
} else {
- // otherwise assume DTD
+ // otherwise assume DTD
SchemaConversionUtils.convertToSchema(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, SCHEMA_LOCATION_URL, VERSION);
}
- }
- finally {
+ } finally {
cursor.dispose();
}
XmlObject result = xmlObject.changeType(FacesConfigDocument.type);
if (result != null) {
XmlBeansUtil.validateDD(result);
- log.debug("convertToFacesConfigSchema(): Exit 2" );
- return(FacesConfigDocument) result;
+ log.debug("convertToFacesConfigSchema(): Exit 2");
+ return (FacesConfigDocument) result;
}
XmlBeansUtil.validateDD(xmlObject);
- log.debug("convertToFacesConfigSchema(): Exit 3" );
- return(FacesConfigDocument) xmlObject;
+ log.debug("convertToFacesConfigSchema(): Exit 3");
+ return (FacesConfigDocument) xmlObject;
}
public static final GBeanInfo GBEAN_INFO;
Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-complex-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-complex-expected.xml?rev=933505&r1=933504&r2=933505&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-complex-expected.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-complex-expected.xml Tue Apr 13 07:21:05 2010
@@ -21,8 +21,8 @@
<!-- simple web app -->
<faces-config xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
- version="1.2">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<application>
<variable-resolver>org.apache.myfaces.examples.accessedbeans.AccessTrackingVariableResolver</variable-resolver>
Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-empty-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-empty-expected.xml?rev=933505&r1=933504&r2=933505&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-empty-expected.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-empty-expected.xml Tue Apr 13 07:21:05 2010
@@ -17,6 +17,6 @@
-->
<faces-config xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
- version="1.2">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
</faces-config>
Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-moderate-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-moderate-expected.xml?rev=933505&r1=933504&r2=933505&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-moderate-expected.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-moderate-expected.xml Tue Apr 13 07:21:05 2010
@@ -19,8 +19,8 @@
<!-- =========== FULL CONFIGURATION FILE ================================== -->
<faces-config xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
- version="1.2">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<navigation-rule>
<from-view-id>/testSuite/*</from-view-id>
Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-simple-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-simple-expected.xml?rev=933505&r1=933504&r2=933505&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-simple-expected.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/resources/1_0_dtd/faces-config-simple-expected.xml Tue Apr 13 07:21:05 2010
@@ -21,8 +21,8 @@
<!-- my components examples -->
<faces-config xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
- version="1.2">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<!-- Managed Beans for sayhello.jsp -->
<managed-bean>