[jboss-svn-commits] JBoss Common SVN: r4391 - in jbossxb/trunk: src/main/java/org/jboss/xb/binding and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 19 03:44:35 EDT 2010
Author: alex.loubyansky at jboss.com
Date: 2010-05-19 03:44:34 -0400 (Wed, 19 May 2010)
New Revision: 4391
Modified:
jbossxb/trunk/.classpath
jbossxb/trunk/.project
jbossxb/trunk/src/main/java/org/jboss/xb/binding/AttributesImpl.java
jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
Log:
minor improvement in reading and filtering JBXB-specifix attributes, use maven2 plugin classpath for eclipse
Modified: jbossxb/trunk/.classpath
===================================================================
--- jbossxb/trunk/.classpath 2010-05-17 16:20:57 UTC (rev 4390)
+++ jbossxb/trunk/.classpath 2010-05-19 07:44:34 UTC (rev 4391)
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.9.GA/jboss-common-core-2.2.9.GA.jar" sourcepath="/M2_REPO/org/jboss/jboss-common-core/2.2.9.GA/jboss-common-core-2.2.9.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="/M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA.jar" sourcepath="/M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="/M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
- <classpathentry kind="lib" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: jbossxb/trunk/.project
===================================================================
--- jbossxb/trunk/.project 2010-05-17 16:20:57 UTC (rev 4390)
+++ jbossxb/trunk/.project 2010-05-19 07:44:34 UTC (rev 4391)
@@ -1,14 +1,23 @@
-<projectDescription>
- <name>jbossxb</name>
- <comment>JBoss XML Binding</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments/>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbossxb</name>
+ <comment>JBoss XML Binding</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/AttributesImpl.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/AttributesImpl.java 2010-05-17 16:20:57 UTC (rev 4390)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/AttributesImpl.java 2010-05-19 07:44:34 UTC (rev 4391)
@@ -198,14 +198,10 @@
(attr.localName == null ? localName == null : attr.localName.equals(localName))
)
{
- break;
+ return attr.value;
}
}
-
- if (attr == null)
- return null;
-
- return attr.value;
+ return null;
}
public String getValue(String qName)
Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java 2010-05-17 16:20:57 UTC (rev 4390)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java 2010-05-19 07:44:34 UTC (rev 4391)
@@ -173,7 +173,6 @@
if(schemaLocation == null && (namespaceURI == null || namespaceURI.length() == 0))
schemaLocation = localName;
}
-
schemaBinding = schemaResolver.resolve(namespaceURI, null, schemaLocation);
if(schemaBinding != null)
particle = schemaBinding.getElementParticle(startName);
@@ -265,11 +264,10 @@
if(resolver == null || !(resolver instanceof MutableSchemaResolver))
return attrs;
- int ind = attrs.getIndex(Constants.NS_JBXB, "schemabinding");
- if (ind != -1)
+ String value = attrs.getValue(Constants.NS_JBXB, "schemabinding");
+ if (value != null)
{
MutableSchemaResolver defaultResolver = (MutableSchemaResolver)resolver;
- String value = attrs.getValue(ind);
java.util.StringTokenizer tokenizer = new java.util.StringTokenizer(value);
while(tokenizer.hasMoreTokens())
{
@@ -290,7 +288,7 @@
AttributesImpl attrsImpl = new AttributesImpl(attrs.getLength() - 1);
for(int i = 0; i < attrs.getLength(); ++i)
{
- if(i != ind)
+ if(!attrs.getURI(i).equals(Constants.NS_JBXB))
attrsImpl.add(attrs.getURI(i), attrs.getLocalName(i), attrs.getQName(i), attrs.getType(i), attrs.getValue(i));
}
attrs = attrsImpl;
More information about the jboss-svn-commits
mailing list