Author: veithen
Date: Sun Jun 24 12:37:59 2012
New Revision: 1353254
URL: http://svn.apache.org/viewvc?rev=1353254&view=rev
Log:
Converted axis2-jaxbri to standard Maven 2 layout.
Added:
axis/axis2/java/core/trunk/modules/jaxbri/src/main/
axis/axis2/java/core/trunk/modules/jaxbri/src/main/java/
axis/axis2/java/core/trunk/modules/jaxbri/src/main/java/org/
- copied from r1353252, axis/axis2/java/core/trunk/modules/jaxbri/src/org/
axis/axis2/java/core/trunk/modules/jaxbri/src/main/resources/
axis/axis2/java/core/trunk/modules/jaxbri/src/main/resources/org/
axis/axis2/java/core/trunk/modules/jaxbri/src/main/resources/org/apache/
axis/axis2/java/core/trunk/modules/jaxbri/src/main/resources/org/apache/axis2/
axis/axis2/java/core/trunk/modules/jaxbri/src/main/resources/org/apache/axis2/jaxbri/
axis/axis2/java/core/trunk/modules/jaxbri/src/main/resources/org/apache/axis2/jaxbri/template/
- copied from r1353252,
axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/
axis/axis2/java/core/trunk/modules/jaxbri/src/test/
axis/axis2/java/core/trunk/modules/jaxbri/src/test/java/
- copied from r1353252, axis/axis2/java/core/trunk/modules/jaxbri/test/
axis/axis2/java/core/trunk/modules/jaxbri/src/test/schemas/
- copied from r1353252,
axis/axis2/java/core/trunk/modules/jaxbri/test-resources/schemas/
axis/axis2/java/core/trunk/modules/jaxbri/src/test/wsdl/
- copied from r1353252,
axis/axis2/java/core/trunk/modules/jaxbri/test-resources/wsdl/
Removed:
axis/axis2/java/core/trunk/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/template/
axis/axis2/java/core/trunk/modules/jaxbri/src/org/
axis/axis2/java/core/trunk/modules/jaxbri/test/
axis/axis2/java/core/trunk/modules/jaxbri/test-resources/
Modified:
axis/axis2/java/core/trunk/modules/jaxbri/pom.xml
axis/axis2/java/core/trunk/modules/jaxbri/src/test/java/org/temp/JaxbSchemaGeneratorTest.java
axis/axis2/java/core/trunk/modules/jaxbri/src/test/java/org/temp/XMLSchemaTest.java
Modified: axis/axis2/java/core/trunk/modules/jaxbri/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri/pom.xml?rev=1353254&r1=1353253&r2=1353254&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxbri/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxbri/pom.xml Sun Jun 24 12:37:59 2012
@@ -71,32 +71,6 @@
<url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri</url>
</scm>
<build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
- <resources>
- <resource>
- <directory>conf</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- </excludes>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <targetPath>../test-resources</targetPath>
- <directory>test-resources</directory>
- <includes>
- <include>**/**</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -133,8 +107,8 @@
<property name="axis2.home"
value="${basedir}/target" />
<property name="maven.class.path"
refid="maven.runtime.classpath" />
<!-- Theres got to be a better way to do this
-->
- <property name="schema.source.dir"
value="test-resources/xsd" />
- <property name="wsdl.source.dir"
value="test-resources/wsdl" />
+ <property name="schema.source.dir"
value="src/test/xsd" />
+ <property name="wsdl.source.dir"
value="src/test/wsdl" />
<property name="schema.output.base.dir"
value="target/schema" />
<property name="schema.generated.src.dir"
value="${schema.output.base.dir}/src" />
<property name="schema.generated.classes.dir"
value="${schema.output.base.dir}/classes" />
Modified:
axis/axis2/java/core/trunk/modules/jaxbri/src/test/java/org/temp/JaxbSchemaGeneratorTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri/src/test/java/org/temp/JaxbSchemaGeneratorTest.java?rev=1353254&r1=1353252&r2=1353254&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxbri/src/test/java/org/temp/JaxbSchemaGeneratorTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxbri/src/test/java/org/temp/JaxbSchemaGeneratorTest.java
Sun Jun 24 12:37:59 2012
@@ -151,18 +151,18 @@ public class JaxbSchemaGeneratorTest ext
}
public String readSchema(Class<?> c, int i) throws Exception {
- return readFile("test-resources" + File.separator + "schemas" +
File.separator
+ return readFile("src" + File.separator + "test" + File.separator +
"schemas" + File.separator
+ "default_generator" + File.separator + c.getSimpleName() +
"-" + i + ".xml");
}
public String readSchemaWithCustomSchema(Class<?> c, int i) throws
Exception {
- return readFile("test-resources" + File.separator + "schemas" +
File.separator
+ return readFile("src" + File.separator + "test" + File.separator +
"schemas" + File.separator
+ "default_generator" + File.separator + c.getSimpleName() +
"with_custom_schema-"
+ i + ".xml");
}
public String readSchemaWithMappingSchema(Class<?> c, int i) throws
Exception {
- return readFile("test-resources" + File.separator + "schemas" +
File.separator
+ return readFile("src" + File.separator + "test" + File.separator +
"schemas" + File.separator
+ "default_generator" + File.separator + c.getSimpleName() +
"with_custom_mapping-"
+ i + ".xml");
}
Modified:
axis/axis2/java/core/trunk/modules/jaxbri/src/test/java/org/temp/XMLSchemaTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri/src/test/java/org/temp/XMLSchemaTest.java?rev=1353254&r1=1353252&r2=1353254&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxbri/src/test/java/org/temp/XMLSchemaTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxbri/src/test/java/org/temp/XMLSchemaTest.java
Sun Jun 24 12:37:59 2012
@@ -41,19 +41,19 @@ public abstract class XMLSchemaTest exte
public final String XMLSchemaNameSpace =
"xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"";;
- public final String CustomSchemaLocation = "test-resources"
+ public final String CustomSchemaLocation = "src" + File.separator + "test"
+ File.separator + "schemas" + File.separator + "custom_schemas"
+ File.separator + "note.xsd";
- public final String customDirectoryLocation = "test-resources"
+ public final String customDirectoryLocation = "src" + File.separator +
"test"
+ File.separator + "schemas" + File.separator + "custom_schemas"
+ File.separator;
- public final String SampleSchemasDirectory = "test-resources"
+ public final String SampleSchemasDirectory = "src" + File.separator +
"test"
+ File.separator + "schemas" + File.separator + "custom_schemas"
+ File.separator;
- public final String MappingFileLocation = "test-resources" + File.separator
+ public final String MappingFileLocation = "src" + File.separator + "test"
+ File.separator
+ "schemas" + File.separator + "custom_schemas" + File.separator
+ "mapping.txt";
