You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2006/11/24 13:05:13 UTC
svn commit: r478848 - in /webservices/jaxme/branches/MAVEN/jaxme-jm: ./ src/
src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/
src/test/ src/test/java/ src/test/java/org/ src/test/java/org/apache/
src/test/java/org/apache/ws/jaxme/j...
Author: jochen
Date: Fri Nov 24 04:05:10 2006
New Revision: 478848
URL: http://svn.apache.org/viewvc?view=rev&rev=478848
Log:
Pulling JAXME-87 in. We have a Maven 2 build now, but the site isn't yet done.
Added:
webservices/jaxme/branches/MAVEN/jaxme-jm/ (with props)
webservices/jaxme/branches/MAVEN/jaxme-jm/pom.xml
webservices/jaxme/branches/MAVEN/jaxme-jm/src/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/main/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/main/java/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/main/java/org/
- copied from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/main/java/org/apache/
- copied from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/
- copied from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/java/org/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/apache/
- copied from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/java/org/apache/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/Address.xml
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/Address.xml
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/Address.xsd
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/Address.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/bindings/
- copied from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/bindings/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/bindings/bindings.jxb
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/bindings/bindings.jxb
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/bindings/bindings.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/bindings/bindings.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/bindings/imported.xsi
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/bindings/imported.xsi
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/build.xml
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/build.xml
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/defaults.xsd
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/defaults.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/enumeration.xsd
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/enumeration.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/group.xsd
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/group.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jaxb.xsd
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jaxb.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/
- copied from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jaxme-10.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jaxme-10.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jaxme-12.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jaxme-12.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jaxme-17.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jaxme-17.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jaxme-20.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jaxme-20.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jaxme-21.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jaxme-21.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jaxme-46.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jaxme-46.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jaxme-58.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jaxme-58.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jaxme-65.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jaxme-65.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jaxme-72.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jaxme-72.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jaxme-83.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jaxme-83.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jaxme-84.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jaxme-84.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jira45.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jira45.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/jira45.xsi
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/jira45.xsi
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/jira/xjcSerializable.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/jira/xjcSerializable.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/nestedGroups.xsd
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/nestedGroups.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/recursion.xsd
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/recursion.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/rss/
- copied from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/rss/
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/rss.xsd
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/rss.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/rss/dc.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/rss/dc.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/rss/rdf.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/rss/rdf.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/rss/rss.xsd
- copied unchanged from r478847, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/rss/rss.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/simpleTypeRestriction.xsd
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/simpleTypeRestriction.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/types.xsd
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/types.xsd
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/xsd/wildcards.xsd
- copied unchanged from r478740, webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/wildcards.xsd
Modified:
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/apache/ws/jaxme/junit/BindingsTest.java
webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/apache/ws/jaxme/junit/WildcardTest.java
Propchange: webservices/jaxme/branches/MAVEN/jaxme-jm/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 24 04:05:10 2006
@@ -0,0 +1 @@
+target
Added: webservices/jaxme/branches/MAVEN/jaxme-jm/pom.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/jaxme-jm/pom.xml?view=auto&rev=478848
==============================================================================
--- webservices/jaxme/branches/MAVEN/jaxme-jm/pom.xml (added)
+++ webservices/jaxme/branches/MAVEN/jaxme-jm/pom.xml Fri Nov 24 04:05:10 2006
@@ -0,0 +1,273 @@
+<?xml version="1.0"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed 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.
+
+-->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxme-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+ <artifactId>jaxme-jm</artifactId>
+ <version>0.6-SNAPSHOT</version>
+ <name>JaxMe JM</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxme-api</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxme-js</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxme-xs</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/target/generated-test-sources/antrun</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>gen-src</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <sourceRoot>${project.build.directory}/generated-sources/antrun/</sourceRoot>
+ <tasks>
+ <property name="srcGenDir" value="${project.build.directory}/generated-sources/antrun/"/>
+
+ <mkdir dir="${srcGenDir}"/>
+
+ <taskdef name="chainGenerator" classname="org.apache.ws.jaxme.js.pattern.Ant$AntChainGenerator"
+ classpathref="maven.test.classpath"
+ />
+
+ <chainGenerator destDir="${srcGenDir}">
+ <classpath>
+ <pathelement location="${basedir}/src/main/java"/> <!-- ?? -->
+ </classpath>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.AttributeSG"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.AttributeSGChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.AttributeSGChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.AttributeSGImpl"/>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.ComplexContentSG"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.ComplexContentSGChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.ComplexContentSGChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.ComplexContentSGImpl"/>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.ComplexTypeSG"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.ComplexTypeSGChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.ComplexTypeSGChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.ComplexTypeSGImpl"/>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.GroupSG"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.GroupSGChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.GroupSGChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.GroupSGImpl"/>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.ObjectSG"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.ObjectSGChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.ObjectSGChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.ObjectSGImpl"/>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.ParticleSG"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.ParticleSGChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.ParticleSGChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.ParticleSGImpl"/>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.PropertySG"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.PropertySGChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.PropertySGChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.PropertySGImpl"/>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.SchemaSG"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.SchemaSGChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.SchemaSGChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.SchemaSGImpl"/>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.SGFactory"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.SGFactoryChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.SGFactoryChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.SGFactoryImpl"/>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.SimpleContentSG"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.SimpleContentSGChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.SimpleContentSGChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.SimpleContentSGImpl"/>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.SimpleTypeSG"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.SimpleTypeSGChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.SimpleTypeSGChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.SimpleTypeSGImpl"/>
+ <chain
+ controllerInterfaceName="org.apache.ws.jaxme.generator.sg.TypeSG"
+ chainInterfaceName="org.apache.ws.jaxme.generator.sg.TypeSGChain"
+ proxyClassName="org.apache.ws.jaxme.generator.sg.impl.TypeSGChainImpl"
+ implementationClassName="org.apache.ws.jaxme.generator.sg.impl.TypeSGImpl"/>
+ </chainGenerator>
+
+ </tasks>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>gen-test</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <testSourceRoot>${project.build.directory}/generated-test-sources/antrun/</testSourceRoot>
+ <tasks>
+ <property name="testSrcGenDir" value="${project.build.directory}/generated-test-sources/antrun/"/>
+
+ <mkdir dir="${testSrcGenDir}"/>
+
+ <taskdef name="xjc" classname="org.apache.ws.jaxme.generator.XJCTask"
+ classpathref="maven.test.classpath"
+ />
+
+ <xjc target="${testSrcGenDir}">
+ <schema dir="${basedir}/src/test/xsd">
+ <include name="*.xsd"/>
+ <include name="jira/*.xsd"/>
+ <exclude name="enumeration.xsd"/>
+ <exclude name="wildcards.xsd"/>
+ <exclude name="rss.xsd"/>
+ <exclude name="**/xjc*.xsd"/>
+ </schema>
+ <produces dir="${testSrcGenDir}" includes="org/apache/ws/jaxme/test/misc/address/*"/>
+ <produces dir="${testSrcGenDir}" includes="org/apache/ws/jaxme/test/misc/defaults/*"/>
+ <produces dir="${testSrcGenDir}" includes="org/apache/ws/jaxme/test/misc/group/*"/>
+ <produces dir="${testSrcGenDir}" includes="org/apache/ws/jaxme/test/misc/jaxb/*"/>
+ <produces dir="${testSrcGenDir}" includes="org/apache/ws/jaxme/test/misc/rss/*"/>
+ <produces dir="${testSrcGenDir}" includes="org/apache/ws/jaxme/test/misc/types/*"/>
+ <produces dir="${testSrcGenDir}" includes="org/apache/ws/jaxme/test/recursion/*"/>
+ </xjc>
+ <xjc target="${testSrcGenDir}" extension="true">
+ <schema dir="${basedir}/src/test/xsd">
+ <include name="enumeration.xsd"/>
+ <include name="wildcards.xsd"/>
+ <!-- <include name="rss.xsd"/> -->
+ <include name="**/xjc*.xsd"/>
+ </schema>
+ <produces dir="${testSrcGenDir}" includes="org/apache/ws/jaxme/test/misc/enumeration/*"/>
+ <produces dir="${testSrcGenDir}" includes="org/apache/ws/jaxme/test/misc/wildcards/*"/>
+ </xjc>
+ <xjc target="${testSrcGenDir}">
+ <schema dir="${basedir}/src/test/xsd/bindings" includes="*.xsd"/>
+ <binding dir="${basedir}/src/test/xsd/bindings" includes="*.jxb"/>
+ <produces dir="${testSrcGenDir}" includes="org/apache/ws/jaxme/test/bindings/**/*"/>
+ </xjc>
+ </tasks>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <!--plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>js.src</name>
+ <value>${basedir}/src/main/java</value>
+ </property>
+ <property>
+ <name>jdbc.driver</name>
+ <value>org.hsqldb.jdbcDriver</value>
+ </property>
+ <property>
+ <name>jdbc.url</name>
+ <value>jdbc:hsqldb:${basedir}/target/db/db</value>
+ </property>
+ <property>
+ <name>jdbc.user</name>
+ <value>sa</value>
+ </property>
+ <property>
+ <name>jdbc.password</name>
+ <value></value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin-->
+
+ </plugins>
+ </build>
+</project>
Modified: webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/apache/ws/jaxme/junit/BindingsTest.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/apache/ws/jaxme/junit/BindingsTest.java?view=diff&rev=478848&r1=478847&r2=478848
==============================================================================
--- webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/apache/ws/jaxme/junit/BindingsTest.java (original)
+++ webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/apache/ws/jaxme/junit/BindingsTest.java Fri Nov 24 04:05:10 2006
@@ -41,11 +41,11 @@
Generator g = new GeneratorImpl();
g.setTargetDirectory(new File("target/tests/binding/src"));
g.setResourceTargetDirectory(new File("target/tests/binding/src"));
- g.addBindings(new InputSource(new File("src/test/resources/bindings/bindings.jxb").toURI().toURL().toExternalForm()));
+ g.addBindings(new InputSource(new File("src/test/xsd/bindings/bindings.jxb").toURI().toURL().toExternalForm()));
SchemaReader sr = new JAXBSchemaReader();
sr.setGenerator(g);
g.setSchemaReader(sr);
- g.generate(new File("src/test/resources/bindings/bindings.xsd"));
+ g.generate(new File("src/test/xsd/bindings/bindings.xsd"));
}
/**
Modified: webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/apache/ws/jaxme/junit/WildcardTest.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/apache/ws/jaxme/junit/WildcardTest.java?view=diff&rev=478848&r1=478847&r2=478848
==============================================================================
--- webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/apache/ws/jaxme/junit/WildcardTest.java (original)
+++ webservices/jaxme/branches/MAVEN/jaxme-jm/src/test/java/org/apache/ws/jaxme/junit/WildcardTest.java Fri Nov 24 04:05:10 2006
@@ -88,8 +88,15 @@
}
public void testMarshalAnyAttribute() throws Exception {
- String expect = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"foo\"/>";
String got = getMarshalledAnyAttribute();
+ int offsetEx = got.indexOf("xmlns:ex");
+ int offsetP = got.indexOf("xmlns:p");
+ final String expect;
+ if (offsetEx < offsetP) {
+ expect = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"foo\"/>";
+ } else {
+ expect = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:p=\"foo\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
+ }
assertEquals(expect, got);
}
@@ -123,8 +130,15 @@
}
public void testMarshalListAttribute() throws Exception {
- String expect = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\"/>";
String got = getMarshalledListAttribute();
+ int offsetEx = got.indexOf("xmlns:ex");
+ int offsetP = got.indexOf("xmlns:p");
+ final String expect;
+ if (offsetEx < offsetP) {
+ expect = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\"/>";
+ } else {
+ expect = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value 2\" xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
+ }
assertEquals(expect, got);
}
@@ -138,8 +152,15 @@
}
public void testMarshalOtherAttribute() throws Exception {
- String expect = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"foo\"/>";
String got = getMarshalledOtherAttribute();
+ int offsetEx = got.indexOf("xmlns:ex");
+ int offsetP = got.indexOf("xmlns:p");
+ final String expect;
+ if (offsetEx < offsetP) {
+ expect = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"foo\"/>";
+ } else {
+ expect = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:p=\"foo\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
+ }
assertEquals(expect, got);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org