### Eclipse Workspace Patch 1.0
#P org.jboss.tools.seam.xml.ui
Index: plugin.xml
===================================================================
--- plugin.xml (revision 41074)
+++ plugin.xml (working copy)
@@ -22,7 +22,7 @@
#P org.jboss.tools.seam.xml
Index: resources/meta/seam-core.meta
===================================================================
--- resources/meta/seam-core.meta (revision 41074)
+++ resources/meta/seam-core.meta (working copy)
@@ -9,6 +9,10 @@
+
+
+
+
@@ -20,6 +24,10 @@
+
+
+
+
@@ -2174,4 +2182,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-international.meta
===================================================================
--- resources/meta/seam-international.meta (revision 41074)
+++ resources/meta/seam-international.meta (working copy)
@@ -8,12 +8,18 @@
+
+
+
+
+
+
@@ -320,4 +326,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-remoting.meta
===================================================================
--- resources/meta/seam-remoting.meta (revision 41074)
+++ resources/meta/seam-remoting.meta (working copy)
@@ -8,6 +8,9 @@
+
+
+
@@ -15,6 +18,9 @@
+
+
+
@@ -302,4 +308,15 @@
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-theme.meta
===================================================================
--- resources/meta/seam-theme.meta (revision 41074)
+++ resources/meta/seam-theme.meta (working copy)
@@ -8,6 +8,9 @@
+
+
+
@@ -15,6 +18,9 @@
+
+
+
@@ -310,4 +316,15 @@
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-mail.meta
===================================================================
--- resources/meta/seam-mail.meta (revision 41074)
+++ resources/meta/seam-mail.meta (working copy)
@@ -8,6 +8,9 @@
+
+
+
@@ -15,6 +18,9 @@
+
+
+
@@ -484,4 +490,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-jms.meta
===================================================================
--- resources/meta/seam-jms.meta (revision 41074)
+++ resources/meta/seam-jms.meta (working copy)
@@ -8,12 +8,18 @@
+
+
+
+
+
+
@@ -435,4 +441,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-framework.meta
===================================================================
--- resources/meta/seam-framework.meta (revision 41074)
+++ resources/meta/seam-framework.meta (working copy)
@@ -8,6 +8,9 @@
+
+
+
@@ -15,6 +18,9 @@
+
+
+
@@ -825,4 +831,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-async.meta
===================================================================
--- resources/meta/seam-async.meta (revision 41074)
+++ resources/meta/seam-async.meta (working copy)
@@ -8,12 +8,18 @@
+
+
+
+
+
+
@@ -284,4 +290,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-web.meta
===================================================================
--- resources/meta/seam-web.meta (revision 41074)
+++ resources/meta/seam-web.meta (working copy)
@@ -8,12 +8,18 @@
+
+
+
+
+
+
@@ -1254,4 +1260,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-security.meta
===================================================================
--- resources/meta/seam-security.meta (revision 41074)
+++ resources/meta/seam-security.meta (working copy)
@@ -8,6 +8,9 @@
+
+
+
@@ -15,6 +18,9 @@
+
+
+
@@ -1042,4 +1048,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-persistence.meta
===================================================================
--- resources/meta/seam-persistence.meta (revision 41074)
+++ resources/meta/seam-persistence.meta (working copy)
@@ -8,12 +8,18 @@
+
+
+
+
+
+
@@ -1017,4 +1023,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-drools.meta
===================================================================
--- resources/meta/seam-drools.meta (revision 41074)
+++ resources/meta/seam-drools.meta (working copy)
@@ -8,6 +8,9 @@
+
+
+
@@ -15,6 +18,9 @@
+
+
+
@@ -587,4 +593,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-ui.meta
===================================================================
--- resources/meta/seam-ui.meta (revision 41074)
+++ resources/meta/seam-ui.meta (working copy)
@@ -8,11 +8,17 @@
+
+
+
+
+
+
@@ -207,4 +213,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-transaction.meta
===================================================================
--- resources/meta/seam-transaction.meta (revision 41074)
+++ resources/meta/seam-transaction.meta (working copy)
@@ -8,12 +8,18 @@
+
+
+
+
+
+
@@ -350,4 +356,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-wicket.meta
===================================================================
--- resources/meta/seam-wicket.meta (revision 41074)
+++ resources/meta/seam-wicket.meta (working copy)
@@ -8,11 +8,17 @@
+
+
+
+
+
+
@@ -113,4 +119,15 @@
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-pdf.meta
===================================================================
--- resources/meta/seam-pdf.meta (revision 41074)
+++ resources/meta/seam-pdf.meta (working copy)
@@ -8,6 +8,9 @@
+
+
+
@@ -15,6 +18,9 @@
+
+
+
@@ -261,4 +267,15 @@
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-navigation.meta
===================================================================
--- resources/meta/seam-navigation.meta (revision 41074)
+++ resources/meta/seam-navigation.meta (working copy)
@@ -8,12 +8,18 @@
+
+
+
+
+
+
@@ -235,4 +241,15 @@
+
+
+
+
+
+
+
+
+
+
Index: resources/meta/seam-components.meta
===================================================================
--- resources/meta/seam-components.meta (revision 41074)
+++ resources/meta/seam-components.meta (working copy)
@@ -16,6 +16,7 @@
+
@@ -24,7 +25,9 @@
+
+
@@ -709,6 +712,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1608,6 +1709,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2546,6 +2768,8 @@
+
+
namespaceToSchema = new HashMap();
private SeamNamespaces(XModelMetaData meta, String versionSuffix) {
- XMapping m = meta.getMapping("SeamNamespaces"); //$NON-NLS-1$
+ String namespacesMapping = "$230".equals(versionSuffix) ? "SeamNamespacesOrg" : "SeamNamespaces"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ XMapping m = meta.getMapping(namespacesMapping);
if(m == null) return;
this.versionSuffix = versionSuffix;
String[] keys = m.getKeys();
@@ -50,7 +51,8 @@
namespaceToURI.put(keys[i], v);
uriToNamespace.put(v, keys[i]);
}
- m = meta.getMapping("SeamSchemas"); //$NON-NLS-1$
+ String schemasMapping = "$230".equals(versionSuffix) ? "SeamSchemasOrg" : "SeamSchemas"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ m = meta.getMapping(schemasMapping);
if(m == null) return;
keys = m.getKeys();
for (int i = 0; i < keys.length; i++) {
Index: src/org/jboss/tools/seam/xml/components/model/SeamComponentsEntityRecognizer.java
===================================================================
--- src/org/jboss/tools/seam/xml/components/model/SeamComponentsEntityRecognizer.java (revision 41074)
+++ src/org/jboss/tools/seam/xml/components/model/SeamComponentsEntityRecognizer.java (working copy)
@@ -40,10 +40,11 @@
if(PUBLIC_ID_11.equals(publicId)) return ENT_SEAM_COMPONENTS_11;
return null;
}
- boolean isSingleComponent = isSingleComponent(body);
- if(!isComponentsSchema(body) && !isSingleComponent) {
+ int isSingleComponent = isSingleComponent(body);
+ if(isComponentsSchema(body) == NONE && isSingleComponent == NONE) {
return null;
}
+ int isMultiComponent = isMultiComponent(body);
int i = body.indexOf("xsi:schemaLocation"); //$NON-NLS-1$
if(i < 0) return null;
@@ -55,8 +56,9 @@
int i12 = schemaLocation.indexOf("1.2"); //$NON-NLS-1$
if(i12 >= 0) {
- if(isSingleComponent) return ENT_SEAM_COMPONENT_12;
- if(isMultiComponent(body)) return ENT_SEAM_COMPONENTS_12;
+ if(isSingleComponent == COM) return ENT_SEAM_COMPONENT_12;
+ if(isMultiComponent == COM) return ENT_SEAM_COMPONENTS_12;
+ return null;
}
//Let it work now for all 2.x versions
//If in future releases differences are essential, this should be modified
@@ -69,7 +71,7 @@
i23 = 0;
}
if(i23 >= 0) {
- if(isSingleComponent) {
+ if(isSingleComponent == COM) {
if(i20 >= 0) {
return ENT_SEAM_COMPONENT_FILE_20;
}
@@ -81,7 +83,7 @@
}
return ENT_SEAM_COMPONENT_FILE_23;
}
- if(isMultiComponent(body)) {
+ if(isMultiComponent == COM) {
if(i20 >= 0) {
return ENT_SEAM_COMPONENTS_20;
}
@@ -93,36 +95,49 @@
}
return ENT_SEAM_COMPONENTS_23;
}
+ if(isSingleComponent == ORG && i23 >= 0) {
+ return ENT_SEAM_COMPONENT_FILE_230;
+ }
+ if(isMultiComponent == ORG && i23 >= 0) {
+ return ENT_SEAM_COMPONENTS_230;
+ }
}
return null;
}
+
+ static int NONE = 0;
+ static int COM = 1;
+ static int ORG = 2;
+
+ static String COM_SCHEMA = "\"http://jboss.com/products/seam/components\""; //$NON-NLS-1$
+ static String ORG_SCHEMA = "\"http://jboss.org/schema/seam/components\""; //$NON-NLS-1$
- private boolean isComponentsSchema(String body) {
+ private int isComponentsSchema(String body) {
int i = body.indexOf("", i); //$NON-NLS-1$
- if(j < 0) return false;
+ if(j < 0) return NONE;
String s = body.substring(i, j);
- return s.indexOf("\"http://jboss.com/products/seam/components\"") > 0; //$NON-NLS-1$
+ return s.indexOf(COM_SCHEMA) > 0 ? COM : s.indexOf(ORG_SCHEMA) > 0 ? ORG : NONE;
}
- private boolean isMultiComponent(String body) {
+ private int isMultiComponent(String body) {
int i = body.indexOf("", i); //$NON-NLS-1$
- if(j < 0) return false;
+ if(j < 0) return NONE;
String s = body.substring(i, j);
- return s.indexOf("\"http://jboss.com/products/seam/components\"") > 0; //$NON-NLS-1$
+ return s.indexOf(COM_SCHEMA) > 0 ? COM : s.indexOf(ORG_SCHEMA) > 0 ? ORG : NONE;
}
- private boolean isSingleComponent(String body) {
+ private int isSingleComponent(String body) {
int i = body.indexOf("= 0) return false;
+ if(i < 0 || is >= 0) return NONE;
int j = body.indexOf(">", i); //$NON-NLS-1$
- if(j < 0) return false;
+ if(j < 0) return NONE;
String s = body.substring(i, j);
- return s.indexOf("\"http://jboss.com/products/seam/components\"") > 0; //$NON-NLS-1$
+ return s.indexOf(COM_SCHEMA) > 0 ? COM : s.indexOf(ORG_SCHEMA) > 0 ? ORG : NONE;
}
}
Index: src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java
===================================================================
--- src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java (revision 41074)
+++ src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java (working copy)
@@ -55,6 +55,7 @@
if(entity.endsWith(SeamComponentConstants.SUFF_21)) return "$21"; //$NON-NLS-1$
if(entity.endsWith(SeamComponentConstants.SUFF_22)) return "$22"; //$NON-NLS-1$
if(entity.endsWith(SeamComponentConstants.SUFF_23)) return "$23"; //$NON-NLS-1$
+ if(entity.endsWith(SeamComponentConstants.SUFF_230)) return "$230"; //$NON-NLS-1$
return ""; //$NON-NLS-1$
}