You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/07/21 19:07:50 UTC
svn commit: r796384 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/databinding/
buildtools/src/main/resources/ parent/ rt/
rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/
rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/ rt/databinding/s...
Author: dkulp
Date: Tue Jul 21 17:07:49 2009
New Revision: 796384
URL: http://svn.apache.org/viewvc?rev=796384&view=rev
Log:
Start progressing toward SDO support for dynamic SDO
Added:
cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml (with props)
cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java
- copied, changed from r796024, cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java
cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_dynamic.wsdl
- copied, changed from r796024, cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl
cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl (contents, props changed)
- copied, changed from r796024, cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl
Removed:
cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/WrapperCapableDatabinding.java
cxf/trunk/parent/pom.xml
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
cxf/trunk/rt/databinding/sdo/pom.xml
cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java
cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java
cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java
cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
cxf/trunk/rt/pom.xml
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/databinding/WrapperCapableDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/databinding/WrapperCapableDatabinding.java?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/databinding/WrapperCapableDatabinding.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/databinding/WrapperCapableDatabinding.java Tue Jul 21 17:07:49 2009
@@ -20,12 +20,15 @@
import java.util.List;
+import javax.xml.namespace.QName;
+
/**
* To create the WrapperHelper instance for the wrapper capable data binding
*/
public interface WrapperCapableDatabinding {
WrapperHelper createWrapperHelper(Class<?> wrapperType,
+ QName typeName,
List<String> partNames,
List<String> elTypeNames,
List<Class<?>> partClasses);
Added: cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml?rev=796384&view=auto
==============================================================================
--- cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml (added)
+++ cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml Tue Jul 21 17:07:49 2009
@@ -0,0 +1,214 @@
+<?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.
+-->
+<!--
+ Modified version of the cxf ruleset to turn off warnings that are common
+ in generated code. Some code generators (like SDO) output some code
+ that generate some PMD warnings. We run PMD as part of the maven
+ build prior to generating code, so it's not a problem there. But in
+ Eclipse, we need a PMD ruleset that turns off those warnings as the
+ PMD eclipse plugin doesn't have a way to not run on certain files
+ -->
+<ruleset name="pmd-eclipse-generated">
+ <description>PMD Plugin preferences rule set</description>
+
+
+ <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
+ <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+ <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+ <!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
+ <!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
+ <!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
+ <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+ <!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
+ <!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
+ <!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
+ <!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
+ <!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
+ <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
+ <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+ <!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
+ <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+ <!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->
+
+ <!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
+ <!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
+ <!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
+ <!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
+
+ <!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
+ <!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
+ <!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
+
+ <!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
+ <!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
+ <!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
+ <!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
+ <!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
+ <!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
+
+ <!--<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>-->
+ <!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
+ <!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
+ <!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
+ <!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
+ <!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
+ <!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
+ <!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
+ <!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
+ <!--<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>-->
+ <!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
+
+ <!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
+ <!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
+ <!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
+
+ <!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
+ <!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
+ <!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
+ <!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
+ <!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
+ <rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
+ <!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
+ <!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
+ <!--<rule ref="rulesets/design.xml/BadComparison"/>-->
+ <!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
+ <!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
+ <!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
+ <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+ <!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
+ <!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
+ <rule ref="rulesets/design.xml/IdempotentOperations"/>
+ <!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
+ <!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
+ <!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
+ <!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
+ <!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
+ <!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
+ <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+ <rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
+ <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+ <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+ <rule ref="rulesets/design.xml/SimplifyConditional"/>
+ <!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
+ <!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
+ <!--rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/-->
+ <!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
+ <!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
+ <!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
+
+ <!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
+ <!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
+ <!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
+ <!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
+ <!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
+ <!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
+
+ <!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
+ <!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
+ <!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
+ <!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
+
+ <!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
+ <!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
+
+ <!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
+ <!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
+ <!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
+ <!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
+ <!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
+ <!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
+ <!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
+ <!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
+
+ <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
+ <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
+ <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
+ <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
+ <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
+
+ <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
+ <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
+ <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
+ <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
+ <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
+ <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
+ <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
+
+ <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
+
+ <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
+
+ <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
+ <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
+ <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
+ <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
+ <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
+
+ <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
+ <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
+
+ <!--rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/-->
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
+ <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
+
+ <rule name="DontUseLoggerGetLogger"
+ message="Don't use Logger.getLogger(...), use LogUtils.getL7dLogger(....) instead"
+ class="net.sourceforge.pmd.rules.XPathRule">
+ <priority>2</priority>
+ <description>Don't use Logger.getLogger(...), use LogUtils.getL7dLogger(....) instead</description>
+ <properties>
+ <property name="xpath">
+ <value>
+<![CDATA[
+//PrimaryPrefix/Name[ends-with(@Image, 'Logger.getLogger') and //PackageDeclaration/Name[starts-with(@Image, 'org.apache.cxf')]]
+]]>
+ </value>
+ </property>
+ </properties>
+ </rule>
+
+</ruleset>
Propchange: cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Jul 21 17:07:49 2009
@@ -71,6 +71,8 @@
<downloadSources>true</downloadSources>
<servicemix.version>3.2.3</servicemix.version>
+
+ <pmd.eclipse.ruleset>cxf-pmd-ruleset.xml</pmd.eclipse.ruleset>
</properties>
@@ -157,7 +159,7 @@
</file>
<file>
<name>.ruleset</name>
- <location>/cxf-pmd-ruleset.xml</location>
+ <location>/${pmd.eclipse.ruleset}</location>
</file>
</additionalConfig>
</configuration>
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Tue Jul 21 17:07:49 2009
@@ -45,6 +45,7 @@
import javax.xml.bind.ValidationEventHandler;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLEventWriter;
@@ -689,7 +690,7 @@
}
}
- public WrapperHelper createWrapperHelper(Class<?> wrapperType, List<String> partNames,
+ public WrapperHelper createWrapperHelper(Class<?> wrapperType, QName wrapperName, List<String> partNames,
List<String> elTypeNames, List<Class<?>> partClasses) {
List<Method> getMethods = new ArrayList<Method>(partNames.size());
List<Method> setMethods = new ArrayList<Method>(partNames.size());
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java Tue Jul 21 17:07:49 2009
@@ -64,6 +64,7 @@
});
WrapperHelper wh = new JAXBDataBinding().createWrapperHelper(SetIsOK.class,
+ null,
partNames,
elTypeNames,
partClasses);
Modified: cxf/trunk/rt/databinding/sdo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/pom.xml?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/pom.xml (original)
+++ cxf/trunk/rt/databinding/sdo/pom.xml Tue Jul 21 17:07:49 2009
@@ -30,6 +30,9 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+ <properties>
+ <pmd.eclipse.ruleset>cxf-pmd-ruleset-generated.xml</pmd.eclipse.ruleset>
+ </properties>
<dependencies>
<dependency>
@@ -135,7 +138,83 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>generate-test-sources-static</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+ <testWsdlRoot>${basedir}/src/test/resources/wsdl_sdo</testWsdlRoot>
+ <wsdlOptions>
+ <wsdlOption>
+ <wsdl>${basedir}/src/test/resources/wsdl_sdo/HelloService_static.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-db</extraarg>
+ <extraarg>sdo</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://apache.org/hello_world_soap_http/types=helloworld.static_types.sdo</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://apache.org/hello_world_soap_http=helloworld.static_types.ws</extraarg>
+ </extraargs>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/test/resources/wsdl_sdo/HelloService_dynamic.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-db</extraarg>
+ <extraarg>sdo-dynamic</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://apache.org/hello_world_soap_http=helloworld.dynamic_types.ws</extraarg>
+ </extraargs>
+ </wsdlOption>
+ </wsdlOptions>
+ </configuration>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>setup.eclipse</id>
+ <build>
+ <defaultGoal>process-test-sources</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>setup.eclipse.project.sdo</id>
+ <phase>process-test-sources</phase>
+ <configuration>
+ <tasks>
+ <echo file="${basedir}/.settings/org.eclipse.jdt.core.prefs" append="true">org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
+ </echo>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java Tue Jul 21 17:07:49 2009
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Set;
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -59,30 +60,39 @@
private final List<String> partNames;
private Method fact;
private Object factory;
+ private QName wrapperName;
- private SDOWrapperHelper(List<String> partNames, Class<?> wrapperType) {
+ private SDOWrapperHelper(List<String> partNames, Class<?> wrapperType, QName wrapperName) {
this.partNames = partNames;
- try {
- String s = wrapperType.getPackage().getName() + ".SdoFactory";
- Class<?> cls = Class.forName(s, false, wrapperType.getClassLoader());
- for (Method m : cls.getMethods()) {
- if (m.getReturnType() == wrapperType) {
- fact = m;
- break;
+ if (DataObject.class != wrapperType) {
+ try {
+ String s = wrapperType.getPackage().getName() + ".SdoFactory";
+ Class<?> cls = Class.forName(s, false, wrapperType.getClassLoader());
+ for (Method m : cls.getMethods()) {
+ if (m.getReturnType() == wrapperType) {
+ fact = m;
+ break;
+ }
}
+ factory = cls.getField("INSTANCE").get(null);
+ } catch (Exception ex) {
+ ex.printStackTrace();
}
- factory = cls.getField("INSTANCE").get(null);
- } catch (Exception ex) {
- ex.printStackTrace();
}
+ this.wrapperName = wrapperName;
}
public Object createWrapperObject(List<?> lst) throws Fault {
DataObject o;
- try {
- o = (DataObject)fact.invoke(factory);
- } catch (Exception e) {
- throw new Fault(e);
+ if (fact != null) {
+ try {
+ o = (DataObject)fact.invoke(factory);
+ } catch (Exception e) {
+ throw new Fault(e);
+ }
+ } else {
+ o = context.getDataFactory().create(wrapperName.getNamespaceURI(),
+ wrapperName.getLocalPart());
}
for (int x = 0; x < lst.size(); x++) {
o.set(partNames.get(x), lst.get(x));
@@ -121,6 +131,9 @@
cc.walk();
for (Class<?> cls : cc.getClasses()) {
+ if (DataObject.class == cls) {
+ continue;
+ }
String pkg = cls.getPackage().getName();
if (!pkgs.contains(pkg)) {
try {
@@ -195,11 +208,12 @@
public WrapperHelper createWrapperHelper(final Class<?> wrapperType,
+ final QName wrapperName,
final List<String> partNames,
final List<String> elTypeNames,
final List<Class<?>> partClasses) {
- return new SDOWrapperHelper(partNames, wrapperType);
+ return new SDOWrapperHelper(partNames, wrapperType, wrapperName);
}
}
Modified: cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java Tue Jul 21 17:07:49 2009
@@ -237,6 +237,9 @@
}
if (genModel == null) {
+ if (dynamic) {
+ return DataObject.class.getName();
+ }
return type.getName();
}
Copied: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java (from r796024, cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java?p2=cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java&p1=cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java&r1=796024&r2=796384&rev=796384&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java Tue Jul 21 17:07:49 2009
@@ -19,9 +19,6 @@
package org.apache.cxf.sdo;
-import java.io.File;
-import java.net.URL;
-import java.net.URLClassLoader;
import javax.jws.WebService;
import javax.xml.namespace.QName;
@@ -29,60 +26,27 @@
import org.w3c.dom.Node;
import org.apache.cxf.frontend.ServerFactoryBean;
-import org.apache.cxf.helpers.FileUtils;
-import org.apache.cxf.tools.wsdlto.WSDLToJava;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
*
*/
-public class HelloWorldStaticTest extends AbstractSDOTest {
- static ClassLoader loader;
- static File output;
-
- @AfterClass
- public static void removeTempStuff() {
- FileUtils.removeDir(output);
- output = null;
- }
+public class HelloWorldDynamicTest extends AbstractSDOTest {
+
- @BeforeClass
- public static void generateClasses() throws Exception {
- URL url = HelloWorldStaticTest.class.getResource(".");
- output = new File(url.toURI());
- output = new File(output, "/generated");
- FileUtils.mkDir(output);
-
-
- url = HelloWorldStaticTest.class.getResource("/wsdl_sdo/HelloService.wsdl");
- String args[] =
- new String[] {"-db", "sdo", "-compile", "-d", output.getAbsolutePath(), "-p",
- "http://apache.org/hello_world_soap_http/types=helloworld.sdo", "-p",
- "http://apache.org/hello_world_soap_http=helloworld.ws", url.toString()};
- WSDLToJava.main(args);
- loader = new URLClassLoader(new URL[] {output.toURL()});
- }
@Before
public void setUp() throws Exception {
super.setUp();
- ClassLoader orig = Thread.currentThread().getContextClassLoader();
- try {
- Thread.currentThread().setContextClassLoader(loader);
- createService(Server.class, new Server(), "TestService", null);
- } finally {
- Thread.currentThread().setContextClassLoader(orig);
- }
+ createService(Server.class, new Server(), "TestService", null);
}
@WebService(targetNamespace = "http://apache.org/hello_world_soap_http",
name = "Greeter",
serviceName = "TestService",
- endpointInterface = "helloworld.ws.Greeter")
+ endpointInterface = "helloworld.dynamic_types.ws.Greeter")
public static class Server {
public java.lang.String sayHi() {
return "Hi!";
@@ -106,7 +70,8 @@
QName name,
SDODataBinding binding) {
ServerFactoryBean sf = super.createServiceFactory(serviceClass, serviceBean, address, name, binding);
- sf.setWsdlLocation(HelloWorldStaticTest.class.getResource("/wsdl_sdo/HelloService.wsdl").toString());
+ sf.setWsdlLocation(HelloWorldStaticTest.class
+ .getResource("/wsdl_sdo/HelloService_dynamic.wsdl").toString());
sf.setServiceName(new QName("http://apache.org/hello_world_soap_http", "SOAPService"));
sf.setEndpointName(new QName("http://apache.org/hello_world_soap_http", "SoapPort"));
return sf;
Modified: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java Tue Jul 21 17:07:49 2009
@@ -19,9 +19,6 @@
package org.apache.cxf.sdo;
-import java.io.File;
-import java.net.URL;
-import java.net.URLClassLoader;
import javax.jws.WebService;
import javax.xml.namespace.QName;
@@ -29,60 +26,27 @@
import org.w3c.dom.Node;
import org.apache.cxf.frontend.ServerFactoryBean;
-import org.apache.cxf.helpers.FileUtils;
-import org.apache.cxf.tools.wsdlto.WSDLToJava;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
*
*/
public class HelloWorldStaticTest extends AbstractSDOTest {
- static ClassLoader loader;
- static File output;
- @AfterClass
- public static void removeTempStuff() {
- FileUtils.removeDir(output);
- output = null;
- }
- @BeforeClass
- public static void generateClasses() throws Exception {
- URL url = HelloWorldStaticTest.class.getResource(".");
- output = new File(url.toURI());
- output = new File(output, "/generated");
- FileUtils.mkDir(output);
-
-
- url = HelloWorldStaticTest.class.getResource("/wsdl_sdo/HelloService.wsdl");
- String args[] =
- new String[] {"-db", "sdo", "-compile", "-d", output.getAbsolutePath(), "-p",
- "http://apache.org/hello_world_soap_http/types=helloworld.sdo", "-p",
- "http://apache.org/hello_world_soap_http=helloworld.ws", url.toString()};
- WSDLToJava.main(args);
- loader = new URLClassLoader(new URL[] {output.toURL()});
- }
@Before
public void setUp() throws Exception {
super.setUp();
- ClassLoader orig = Thread.currentThread().getContextClassLoader();
- try {
- Thread.currentThread().setContextClassLoader(loader);
- createService(Server.class, new Server(), "TestService", null);
- } finally {
- Thread.currentThread().setContextClassLoader(orig);
- }
+ createService(Server.class, new Server(), "TestService", null);
}
@WebService(targetNamespace = "http://apache.org/hello_world_soap_http",
name = "Greeter",
serviceName = "TestService",
- endpointInterface = "helloworld.ws.Greeter")
+ endpointInterface = "helloworld.static_types.ws.Greeter")
public static class Server {
public java.lang.String sayHi() {
return "Hi!";
@@ -106,7 +70,8 @@
QName name,
SDODataBinding binding) {
ServerFactoryBean sf = super.createServiceFactory(serviceClass, serviceBean, address, name, binding);
- sf.setWsdlLocation(HelloWorldStaticTest.class.getResource("/wsdl_sdo/HelloService.wsdl").toString());
+ sf.setWsdlLocation(HelloWorldStaticTest.class
+ .getResource("/wsdl_sdo/HelloService_static.wsdl").toString());
sf.setServiceName(new QName("http://apache.org/hello_world_soap_http", "SOAPService"));
sf.setEndpointName(new QName("http://apache.org/hello_world_soap_http", "SoapPort"));
return sf;
Copied: cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_dynamic.wsdl (from r796024, cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_dynamic.wsdl?p2=cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_dynamic.wsdl&p1=cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl&r1=796024&r2=796384&rev=796384&view=diff
==============================================================================
(empty)
Copied: cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl (from r796024, cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl?p2=cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl&p1=cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl&r1=796024&r2=796384&rev=796384&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java Tue Jul 21 17:07:49 2009
@@ -27,6 +27,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -112,7 +113,7 @@
}
}
- public WrapperHelper createWrapperHelper(Class<?> wrapperType, List<String> partNames,
+ public WrapperHelper createWrapperHelper(Class<?> wrapperType, QName wrapperName, List<String> partNames,
List<String> elTypeNames, List<Class<?>> partClasses) {
List<Method> getMethods = new ArrayList<Method>(partNames.size());
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java Tue Jul 21 17:07:49 2009
@@ -25,6 +25,8 @@
import java.util.List;
import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.databinding.WrapperCapableDatabinding;
@@ -170,6 +172,12 @@
List<String> partNames = new ArrayList<String>();
List<String> elTypeNames = new ArrayList<String>();
List<Class<?>> partClasses = new ArrayList<Class<?>>();
+ QName wrapperName = null;
+ for (MessagePartInfo p : wrappedMessageInfo.getMessageParts()) {
+ if (wrapperClass == p.getTypeClass()) {
+ wrapperName = p.getElementQName();
+ }
+ }
for (MessagePartInfo p : messageInfo.getMessageParts()) {
if (Boolean.TRUE.equals(p.getProperty(ReflectionServiceFactoryBean.HEADER))) {
@@ -199,9 +207,10 @@
}
}
return dataBinding.createWrapperHelper(wrapperClass,
- partNames,
- elTypeNames,
- partClasses);
+ wrapperName,
+ partNames,
+ elTypeNames,
+ partClasses);
}
private void ensureSize(List<?> lst, int idx) {
while (idx >= lst.size()) {
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java Tue Jul 21 17:07:49 2009
@@ -23,6 +23,8 @@
import java.util.ArrayList;
import java.util.List;
+import javax.xml.namespace.QName;
+
import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.databinding.WrapperCapableDatabinding;
import org.apache.cxf.databinding.WrapperHelper;
@@ -147,7 +149,13 @@
List<String> partNames = new ArrayList<String>();
List<String> elTypeNames = new ArrayList<String>();
List<Class<?>> partClasses = new ArrayList<Class<?>>();
-
+ QName wrapperName = null;
+ for (MessagePartInfo p : wrappedMessageInfo.getMessageParts()) {
+ if (p.getTypeClass() == wrapperClass) {
+ wrapperName = p.getElementQName();
+ }
+ }
+
for (MessagePartInfo p : messageInfo.getMessageParts()) {
ensureSize(partNames, p.getIndex());
ensureSize(elTypeNames, p.getIndex());
@@ -167,8 +175,9 @@
partClasses.set(p.getIndex(), p.getTypeClass());
}
return dataBinding.createWrapperHelper(wrapperClass,
- partNames,
- elTypeNames,
- partClasses);
+ wrapperName,
+ partNames,
+ elTypeNames,
+ partClasses);
}
}
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java Tue Jul 21 17:07:49 2009
@@ -70,7 +70,7 @@
String className = requestClass.getName();
className = className.substring(0, className.lastIndexOf(".") + 1);
- WrapperHelper wh = new JAXBDataBinding().createWrapperHelper(requestClass,
+ WrapperHelper wh = new JAXBDataBinding().createWrapperHelper(requestClass, null,
partNames, elTypeNames, partClasses);
List<Object> paraList = new ArrayList<Object>();
@@ -89,7 +89,7 @@
className = responseClass.getName();
className = className.substring(0, className.lastIndexOf(".") + 1);
- wh = new JAXBDataBinding().createWrapperHelper(responseClass,
+ wh = new JAXBDataBinding().createWrapperHelper(responseClass, null,
partNames, elTypeNames, partClasses);
List<Object> resPara = new ArrayList<Object>();
List<Integer> intValueList = new ArrayList<Integer>();
Modified: cxf/trunk/rt/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/pom.xml?rev=796384&r1=796383&r2=796384&view=diff
==============================================================================
--- cxf/trunk/rt/pom.xml (original)
+++ cxf/trunk/rt/pom.xml Tue Jul 21 17:07:49 2009
@@ -38,6 +38,7 @@
<module>databinding/jaxb</module>
<module>databinding/xmlbeans</module>
<module>databinding/aegis</module>
+ <module>databinding/sdo</module>
<module>bindings</module>
<module>frontend/simple</module>
<module>frontend/jaxws</module>