Author: jochen
Date: Tue Feb 10 21:55:41 2009
New Revision: 743117
URL: http://svn.apache.org/viewvc?rev=743117&view=rev
Log:
Successfull build with Java 6.
Added:
webservices/jaxme/trunk/ws-jaxme/.settings/org.maven.ide.eclipse.prefs
Modified:
webservices/jaxme/trunk/ws-jaxme/.classpath
webservices/jaxme/trunk/ws-jaxme/.project
webservices/jaxme/trunk/ws-jaxme/.settings/org.eclipse.jdt.core.prefs
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/pom.xml
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/changes/changes.xml
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/Marshaller.java
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/Unmarshaller.java
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractMarshallerImpl.java
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
webservices/jaxme/trunk/ws-jaxme/jaxme-jm/pom.xml
webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
webservices/jaxme/trunk/ws-jaxme/jaxme-js/pom.xml
webservices/jaxme/trunk/ws-jaxme/jaxme-js/src/main/java/org/apache/ws/jaxme/js/util/AntLinkChecker.java
webservices/jaxme/trunk/ws-jaxme/jaxme-pm/pom.xml
webservices/jaxme/trunk/ws-jaxme/jaxme-xs/pom.xml
webservices/jaxme/trunk/ws-jaxme/pom.xml
Modified: webservices/jaxme/trunk/ws-jaxme/.classpath
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/.classpath?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/.classpath (original)
+++ webservices/jaxme/trunk/ws-jaxme/.classpath Tue Feb 10 21:55:41 2009
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="jaxme-api/target/classes"
path="jaxme-api/src/main/java"/>
+ <classpathentry kind="src" output="jaxme-jaxb-api/target/classes"
path="jaxme-jaxb-api/src/main/java"/>
+ <classpathentry kind="src" output="jaxme-jaxb-api/target/test-classes"
path="jaxme-jaxb-api/src/test/java"/>
<classpathentry kind="src" output="jaxme-js/target/classes"
path="jaxme-js/src/main/java"/>
<classpathentry kind="src" output="jaxme-js/target/classes"
path="jaxme-js/target/generated-sources/antlr"/>
- <classpathentry kind="src" output="jaxme-js/target/test-classes"
path="jaxme-js/src/test/java"/>
- <classpathentry kind="src" output="jaxme-js/target/test-classes"
path="jaxme-js/target/generated-test-sources/proxy"/>
<classpathentry excluding="**" kind="src"
output="jaxme-js/target/classes" path="jaxme-js/src/main/resources"/>
+ <classpathentry kind="src" output="jaxme-js/target/test-classes"
path="jaxme-js/src/test/java"/>
<classpathentry kind="src" output="jaxme-xs/target/classes"
path="jaxme-xs/src/main/java"/>
<classpathentry kind="src" output="jaxme-xs/target/test-classes"
path="jaxme-xs/src/test/java"/>
<classpathentry kind="src" output="jaxme-jm/target/classes"
path="jaxme-jm/src/main/java"/>
<classpathentry kind="src" output="jaxme-jm/target/classes"
path="jaxme-jm/target/generated-sources/antrun"/>
<classpathentry kind="src" output="jaxme-jm/target/test-classes"
path="jaxme-jm/src/test/java"/>
+ <classpathentry kind="src" output="jaxme-jm/target/test-classes"
path="jaxme-jm/target/generated-test-sources/antrun"/>
<classpathentry
excluding="org/apache/ws/jaxme/generator/ino/api4j/|org/apache/ws/jaxme/pm/ino/api4j/"
kind="src" output="jaxme-pm/target/classes" path="jaxme-pm/src/main/java"/>
<classpathentry kind="src" output="jaxme-pm/target/test-classes"
path="jaxme-pm/src/test/java"/>
- <classpathentry kind="src" output="jaxme-jm/target/test-classes"
path="jaxme-jm/target/generated-test-sources/antrun"/>
- <classpathentry kind="src" output="jaxme-pm/target/test-classes"
path="jaxme-pm/target/generated-test-sources/antrun"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry excluding="**" kind="src"
output="jaxme-pm/target/test-classes"
path="jaxme-pm/target/generated-test-sources/antrun"/>
+ <classpathentry kind="src"
path="jaxme-js/target/generated-test-sources/proxy"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: webservices/jaxme/trunk/ws-jaxme/.project
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/.project?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/.project (original)
+++ webservices/jaxme/trunk/ws-jaxme/.project Tue Feb 10 21:55:41 2009
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>ws-jaxme-maven1</name>
+ <name>ws-jaxme</name>
<comment></comment>
<projects>
</projects>
Modified: webservices/jaxme/trunk/ws-jaxme/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/.settings/org.eclipse.jdt.core.prefs?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
Binary files - no diff available.
Added: webservices/jaxme/trunk/ws-jaxme/.settings/org.maven.ide.eclipse.prefs
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/.settings/org.maven.ide.eclipse.prefs?rev=743117&view=auto
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/.settings/org.maven.ide.eclipse.prefs
(added)
+++ webservices/jaxme/trunk/ws-jaxme/.settings/org.maven.ide.eclipse.prefs Tue
Feb 10 21:55:41 2009
@@ -0,0 +1,8 @@
+#Tue Feb 10 22:19:46 CET 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=true
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+version=1
Modified: webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/pom.xml?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/pom.xml (original)
+++ webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/pom.xml Tue Feb 10 21:55:41
2009
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.ws.jaxme</groupId>
<artifactId>jaxme-parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>2</version>
</parent>
<artifactId>jaxme-jaxb-2.1-api</artifactId>
<version>0.6-SNAPSHOT</version>
@@ -88,7 +88,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.2.2</version>
<configuration>
<textOutputFile>target/clirr.txt</textOutputFile>
<comparisonArtifacts>
Modified:
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/changes/changes.xml?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/changes/changes.xml
(original)
+++ webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/changes/changes.xml Tue
Feb 10 21:55:41 2009
@@ -3,7 +3,7 @@
<title>Changes in JaxMe JAXB API</title>
</properties>
<body>
- <release version="0.6-SNAPSHOT" date="Not yet released">
+ <release version="0.6" date="Not yet released">
<action dev="jochen" type="update">
Maven 2 is now used as the build system.
</action>
Modified:
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/Marshaller.java
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/Marshaller.java?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
---
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/Marshaller.java
(original)
+++
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/Marshaller.java
Tue Feb 10 21:55:41 2009
@@ -59,8 +59,7 @@
* @param pObject An object, which has been passed to either
* of the marshal methods.
*/
- public void beforeMarshal(
- @SuppressWarnings("unused") Object pObject) {
+ public void beforeMarshal(Object pObject) {
// Does nothing.
}
@@ -70,8 +69,7 @@
* @param pObject An object, which has been passed to either
* of the marshal methods.
*/
- public void afterMarshal(
- @SuppressWarnings("unused") Object pObject) {
+ public void afterMarshal(Object pObject) {
// Does nothing.
}
}
@@ -379,7 +377,8 @@
* doesn't support adapters.
* @since JAXB 2.0
*/
- void setAdapter(XmlAdapter<?,?> adapter );
+ @SuppressWarnings("unchecked")
+ void setAdapter(XmlAdapter adapter);
/**
* Sets an adapter for conversion of Java/XML types.
@@ -392,7 +391,8 @@
* doesn't support adapters.
* @since JAXB 2.0
*/
- public <A extends XmlAdapter<?,?>> void setAdapter(Class<A> pType, A
pAdapter);
+ @SuppressWarnings("unchecked")
+ <A extends XmlAdapter> void setAdapter(Class<A> pType, A pAdapter);
/**
* Returns the adapter, which is currently registered for the
@@ -406,7 +406,8 @@
* doesn't support adapters.
* @since JAXB 2.0
*/
- public <A extends XmlAdapter<?,?>> A getAdapter(Class<A> pType);
+ @SuppressWarnings("unchecked")
+ <A extends XmlAdapter> A getAdapter(Class<A> pType);
/**
* Sets an attachment handler, which allows to marshal parts
Modified:
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/Unmarshaller.java
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/Unmarshaller.java?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
---
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/Unmarshaller.java
(original)
+++
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/Unmarshaller.java
Tue Feb 10 21:55:41 2009
@@ -404,7 +404,8 @@
* doesn't support adapters.
* @since JAXB 2.0
*/
- void setAdapter(XmlAdapter<?,?> adapter );
+ @SuppressWarnings("unchecked")
+ void setAdapter(XmlAdapter pAdapter );
/**
* Sets an adapter for conversion of Java/XML types.
@@ -417,7 +418,8 @@
* doesn't support adapters.
* @since JAXB 2.0
*/
- public <A extends XmlAdapter<?,?>> void setAdapter(Class<A> pType, A
pAdapter);
+ @SuppressWarnings("unchecked")
+ public <A extends XmlAdapter> void setAdapter(Class<A> pType, A
pAdapter);
/**
* Returns the adapter, which is currently registered for the
@@ -431,7 +433,8 @@
* doesn't support adapters.
* @since JAXB 2.0
*/
- public <A extends XmlAdapter<?,?>> A getAdapter(Class<A> pType);
+ @SuppressWarnings("unchecked")
+ <A extends XmlAdapter> A getAdapter(Class<A> pType);
/**
* Sets an attachment handler, which allows to unmarshal parts
Modified:
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractMarshallerImpl.java
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractMarshallerImpl.java?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
---
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractMarshallerImpl.java
(original)
+++
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractMarshallerImpl.java
Tue Feb 10 21:55:41 2009
@@ -357,17 +357,19 @@
}
@SuppressWarnings("unchecked")
- public void setAdapter(XmlAdapter<?,?> adapter) {
- if(adapter==null)
+ public void setAdapter(XmlAdapter adapter) {
+ if (adapter==null)
throw new IllegalArgumentException();
setAdapter((Class)adapter.getClass(),adapter);
}
- public <A extends XmlAdapter<?,?>> void setAdapter(Class<A> type, A
adapter) {
+ @SuppressWarnings("unchecked")
+ public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
throw new UnsupportedOperationException();
}
- public <A extends XmlAdapter<?,?>> A getAdapter(Class<A> type) {
+ @SuppressWarnings("unchecked")
+ public <A extends XmlAdapter> A getAdapter(Class<A> type) {
throw new UnsupportedOperationException();
}
Modified:
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
---
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
(original)
+++
webservices/jaxme/trunk/ws-jaxme/jaxme-jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
Tue Feb 10 21:55:41 2009
@@ -303,17 +303,19 @@
}
@SuppressWarnings("unchecked")
- public void setAdapter(XmlAdapter<?,?> adapter) {
- if(adapter==null)
+ public void setAdapter(XmlAdapter pAdapter) {
+ if (pAdapter==null)
throw new IllegalArgumentException();
- setAdapter((Class)adapter.getClass(),adapter);
+ setAdapter((Class)pAdapter.getClass(), pAdapter);
}
- public <A extends XmlAdapter<?,?>> void setAdapter(Class<A> type, A
adapter) {
+ @SuppressWarnings("unchecked")
+ public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
throw new UnsupportedOperationException();
}
- public <A extends XmlAdapter<?,?>> A getAdapter(Class<A> type) {
+ @SuppressWarnings("unchecked")
+ public <A extends XmlAdapter> A getAdapter(Class<A> type) {
throw new UnsupportedOperationException();
}
Modified: webservices/jaxme/trunk/ws-jaxme/jaxme-jm/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jm/pom.xml?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/jaxme-jm/pom.xml (original)
+++ webservices/jaxme/trunk/ws-jaxme/jaxme-jm/pom.xml Tue Feb 10 21:55:41 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.ws.jaxme</groupId>
<artifactId>jaxme-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>2</version>
</parent>
<artifactId>jaxme2</artifactId>
<version>0.6-SNAPSHOT</version>
@@ -33,47 +33,35 @@
<dependencies>
<dependency>
<groupId>org.apache.ws.jaxme</groupId>
- <artifactId>jaxmeapi</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.jaxme</groupId>
<artifactId>jaxmejs</artifactId>
- <version>${version}</version>
+ <version>0.6-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.ws.jaxme</groupId>
<artifactId>jaxmexs</artifactId>
- <version>${version}</version>
+ <version>0.6-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.7.1</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>
Modified:
webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JMMarshallerImpl.java?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
---
webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
(original)
+++
webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
Tue Feb 10 21:55:41 2009
@@ -15,6 +15,8 @@
*/
package org.apache.ws.jaxme.impl;
+import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@@ -25,13 +27,21 @@
import javax.xml.bind.MarshalException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.PropertyException;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+import javax.xml.bind.attachment.AttachmentMarshaller;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Result;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamResult;
+import javax.xml.validation.Schema;
-import org.apache.ws.jaxme.*;
+import org.apache.ws.jaxme.JMElement;
+import org.apache.ws.jaxme.JMManager;
+import org.apache.ws.jaxme.JMMarshaller;
+import org.apache.ws.jaxme.XMLWriter;
import org.apache.ws.jaxme.util.DOMBuilder;
import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
@@ -43,119 +53,131 @@
* @version $Id$
*/
public class JMMarshallerImpl extends JMControllerImpl implements JMMarshaller
{
- /** Default value for {...@link Marshaller#JAXB_ENCODING}.
- * (UTF-8 encoding)
- */
- public static final String DEFAULT_JAXB_ENCODING = "UTF-8";
-
- /** Default value for {...@link #JAXME_INDENTATION_STRING}: Two blanks.
- */
- public static final String DEFAULT_JAXME_INDENTATION_STRING = " ";
-
- /** Default value for {...@link #JAXME_INDENTATION_SEPARATOR}.
- * ("\n", Line Feed)
- */
- public static final String DEFAULT_JAXME_INDENTATION_SEPARATOR = "\n";
-
- /** Property name for setting the String used to indent
- * the formatted output by one level.
- * ("jaxme.indentation.string")
- * Defaults to {...@link #DEFAULT_JAXME_INDENTATION_STRING}.
- *
- * @see #setIndentationString
- * @see #getIndentationString
- */
- public static final String JAXME_INDENTATION_STRING =
"jaxme.indentation.string";
-
- /** Property name for setting the String used as a
- * line separator in the formatted output.
- * ("jaxme.indentation.separator")
- *
- * @see #setIndentationSeparator
- * @see #getIndentationSeparator
- */
- public static final String JAXME_INDENTATION_SEPARATOR =
"jaxme.indentation.separator";
-
- /** Property name for choosing whether the marshalled
- * output should contain an XML declaration. The methods
- * {...@link #marshal(Object, OutputStream)} and
- * {...@link #marshal(Object, Writer)} recognize
- * requests for XML declarations.
- *
- * @see #setXmlDeclaration(boolean)
- * @see #getXmlDeclaration
- */
- public static final String JAXME_XML_DECLARATION = "jaxme.xml.declaration";
-
- /** Property name for a SAX {...@link ContentHandler} which is able to
- * marshal a SAX stream into a character stream. The property value is
- * an instance of {...@link Class} implementing {...@link XMLWriter}.
- */
- public static final String JAXME_XML_WRITER = "jaxme.xml.writer";
-
- private static final Class xmlWriterClassDefault;
-
- static {
- Class c;
- try {
- Class.forName("java.nio.charset.Charset ");
- c = Class.forName("org.apache.ws.jaxme.impl.CharSetXMLWriter");
- c.newInstance();
- } catch (Exception e) {
- c = XMLWriterImpl.class;
- }
- xmlWriterClassDefault = c;
- }
-
- private String encoding = DEFAULT_JAXB_ENCODING;
- private boolean indentation = true;
- private String indentationString = DEFAULT_JAXME_INDENTATION_STRING;
- private String indentationSeparator = DEFAULT_JAXME_INDENTATION_SEPARATOR;
- private boolean xmlDeclaration = true;
- private Class xmlWriterClass;
- private String noNamespaceSchemaLocation, schemaLocation;
-
- /** Sets the controllers encoding; to be used in
- * marshalling. Defaults to {...@link #DEFAULT_JAXB_ENCODING}.
- *
- * @param pEncoding Suggested encoding or null to restore
- * the default
- */
- public void setEncoding(String pEncoding) throws PropertyException {
- if (pEncoding == null) {
- pEncoding = DEFAULT_JAXB_ENCODING;
- }
- encoding = pEncoding;
- }
-
- /** Returns the controllers encoding; to be used in
- * marshalling. Defaults to {...@link #DEFAULT_JAXB_ENCODING}.
- */
- public String getEncoding() { return encoding; }
-
- /** Sets the controllers class implementing {...@link XMLWriter}.
- * Defaults to {...@link XMLWriterImpl}.
- *
- * @param pClass A class implementing {...@link XMLWriterImpl} or
- * null to restore the default.
- */
- public void setXMLWriterClass(Class pClass) throws PropertyException {
- if (pClass == null) {
- // Restore
- xmlWriterClass = null;
- } else if (XMLWriter.class.isAssignableFrom(pClass) &&
!pClass.isInterface()) {
- xmlWriterClass = pClass;
- } else {
- throw new PropertyException("The class " + pClass.getName() + " is not
implementing " + XMLWriter.class.getName());
- }
- }
-
- /** <p>Returns the controllers class implementing {...@link XMLWriter}.
- * Defaults to {...@link XMLWriterImpl}.</p>
- */
- public Class getXMLWriterClass() {
- return xmlWriterClass == null ? xmlWriterClassDefault : xmlWriterClass;
- }
+ /** Default value for {...@link Marshaller#JAXB_ENCODING}.
+ * (UTF-8 encoding)
+ */
+ public static final String DEFAULT_JAXB_ENCODING = "UTF-8";
+
+ /** Default value for {...@link #JAXME_INDENTATION_STRING}: Two blanks.
+ */
+ public static final String DEFAULT_JAXME_INDENTATION_STRING = " ";
+
+ /** Default value for {...@link #JAXME_INDENTATION_SEPARATOR}.
+ * ("\n", Line Feed)
+ */
+ public static final String DEFAULT_JAXME_INDENTATION_SEPARATOR = "\n";
+
+ /** Property name for setting the String used to indent
+ * the formatted output by one level.
+ * ("jaxme.indentation.string")
+ * Defaults to {...@link #DEFAULT_JAXME_INDENTATION_STRING}.
+ *
+ * @see #setIndentationString
+ * @see #getIndentationString
+ */
+ public static final String JAXME_INDENTATION_STRING =
"jaxme.indentation.string";
+
+ /** Property name for setting the String used as a
+ * line separator in the formatted output.
+ * ("jaxme.indentation.separator")
+ *
+ * @see #setIndentationSeparator
+ * @see #getIndentationSeparator
+ */
+ public static final String JAXME_INDENTATION_SEPARATOR =
"jaxme.indentation.separator";
+
+ /** Property name for choosing whether the marshalled
+ * output should contain an XML declaration. The methods
+ * {...@link #marshal(Object, OutputStream)} and
+ * {...@link #marshal(Object, Writer)} recognize
+ * requests for XML declarations.
+ *
+ * @see #setXmlDeclaration(boolean)
+ * @see #getXmlDeclaration
+ */
+ public static final String JAXME_XML_DECLARATION =
"jaxme.xml.declaration";
+
+ /** Property name for a SAX {...@link ContentHandler} which is able to
+ * marshal a SAX stream into a character stream. The property value is
+ * an instance of {...@link Class} implementing {...@link XMLWriter}.
+ */
+ public static final String JAXME_XML_WRITER = "jaxme.xml.writer";
+
+ private static final Class<? extends XMLWriter> xmlWriterClassDefault;
+
+ @SuppressWarnings("unchecked")
+ private static Class<? extends XMLWriter> asXMLWriterClass(Class<?>
pClass) {
+ if (!XMLWriter.class.isAssignableFrom(pClass)) {
+ throw new IllegalArgumentException("The class " +
pClass.getName()
+ + " doesn't implement " +
XMLWriter.class.getName());
+ }
+ return (Class<? extends XMLWriter>) pClass;
+ }
+
+ static {
+ Class<?> c;
+ try {
+ Class.forName("java.nio.charset.Charset ");
+ c =
Class.forName("org.apache.ws.jaxme.impl.CharSetXMLWriter");
+ c.newInstance();
+ } catch (Exception e) {
+ c = XMLWriterImpl.class;
+ }
+ xmlWriterClassDefault = asXMLWriterClass(c);
+ }
+
+ private String encoding = DEFAULT_JAXB_ENCODING;
+ private boolean indentation = true;
+ private String indentationString = DEFAULT_JAXME_INDENTATION_STRING;
+ private String indentationSeparator =
DEFAULT_JAXME_INDENTATION_SEPARATOR;
+ private boolean xmlDeclaration = true;
+ private Class<? extends XMLWriter> xmlWriterClass;
+ private String noNamespaceSchemaLocation, schemaLocation;
+ private Listener listener;
+ private AttachmentMarshaller attachmentMarshaller;
+
+ /** Sets the controllers encoding; to be used in
+ * marshalling. Defaults to {...@link #DEFAULT_JAXB_ENCODING}.
+ *
+ * @param pEncoding Suggested encoding or null to restore
+ * the default
+ */
+ public void setEncoding(String pEncoding) throws PropertyException {
+ if (pEncoding == null) {
+ encoding = DEFAULT_JAXB_ENCODING;
+ } else {
+ encoding = pEncoding;
+ }
+ }
+
+ /** Returns the controllers encoding; to be used in
+ * marshalling. Defaults to {...@link #DEFAULT_JAXB_ENCODING}.
+ */
+ public String getEncoding() { return encoding; }
+
+ /** Sets the controllers class implementing {...@link XMLWriter}.
+ * Defaults to {...@link XMLWriterImpl}.
+ *
+ * @param pClass A class implementing {...@link XMLWriterImpl} or
+ * null to restore the default.
+ */
+ public void setXMLWriterClass(Class<? extends XMLWriter> pClass) throws
PropertyException {
+ if (pClass == null) {
+ // Restore
+ xmlWriterClass = null;
+ } else if (XMLWriter.class.isAssignableFrom(pClass) &&
!pClass.isInterface()) {
+ xmlWriterClass = pClass;
+ } else {
+ throw new PropertyException("The class " +
pClass.getName() + " is not implementing " + XMLWriter.class.getName());
+ }
+ }
+
+ /** <p>Returns the controllers class implementing {...@link XMLWriter}.
+ * Defaults to {...@link XMLWriterImpl}.</p>
+ */
+ public Class<? extends XMLWriter> getXMLWriterClass() {
+ return xmlWriterClass == null ? xmlWriterClassDefault :
xmlWriterClass;
+ }
/** <p>Sets whether XML documents generated by the controller
* ought to be formatted. Defaults to true.</p>
@@ -280,60 +302,62 @@
return noNamespaceSchemaLocation;
}
- public void setProperty(String pProperty, Object pValue)
- throws PropertyException {
- if (pProperty.startsWith("jaxb.")) {
- if (Marshaller.JAXB_ENCODING.equals(pProperty)) {
- setEncoding((String) pValue);
- return;
- } else if (Marshaller.JAXB_FORMATTED_OUTPUT.equals(pProperty)) {
- setIndentation(((Boolean) pValue).booleanValue());
- return;
- } else if
(Marshaller.JAXB_NO_NAMESPACE_SCHEMA_LOCATION.equals(pProperty)) {
- setNoNamespaceSchemaLocation((String) pValue);
- return;
- } else if (Marshaller.JAXB_SCHEMA_LOCATION.equals(pProperty)) {
- setSchemaLocation((String) pValue);
- return;
- }
- } else if (pProperty.startsWith("jaxme.")) {
- if (JAXME_XML_WRITER.equals(pProperty)) {
- setXMLWriterClass((Class) pValue);
- return;
- } else if (JAXME_XML_DECLARATION.equals(pProperty)) {
- setXmlDeclaration(((Boolean) pValue).booleanValue());
- return;
- } else if (JAXME_INDENTATION_SEPARATOR.equals(pProperty)) {
- setIndentationSeparator((String) pValue);
- return;
- } else if (JAXME_INDENTATION_STRING.equals(pProperty)) {
- setIndentationString((String) pValue);
- return;
- }
+ @Override
+ public void setProperty(String pProperty, Object pValue)
+ throws PropertyException {
+ if (pProperty.startsWith("jaxb.")) {
+ if (Marshaller.JAXB_ENCODING.equals(pProperty)) {
+ setEncoding((String) pValue);
+ return;
+ } else if (Marshaller.JAXB_FORMATTED_OUTPUT.equals(pProperty)) {
+ setIndentation(((Boolean) pValue).booleanValue());
+ return;
+ } else if
(Marshaller.JAXB_NO_NAMESPACE_SCHEMA_LOCATION.equals(pProperty)) {
+ setNoNamespaceSchemaLocation((String) pValue);
+ return;
+ } else if (Marshaller.JAXB_SCHEMA_LOCATION.equals(pProperty)) {
+ setSchemaLocation((String) pValue);
+ return;
+ }
+ } else if (pProperty.startsWith("jaxme.")) {
+ if (JAXME_XML_WRITER.equals(pProperty)) {
+ setXMLWriterClass(asXMLWriterClass((Class<?>) pValue));
+ return;
+ } else if (JAXME_XML_DECLARATION.equals(pProperty)) {
+ setXmlDeclaration(((Boolean) pValue).booleanValue());
+ return;
+ } else if (JAXME_INDENTATION_SEPARATOR.equals(pProperty)) {
+ setIndentationSeparator((String) pValue);
+ return;
+ } else if (JAXME_INDENTATION_STRING.equals(pProperty)) {
+ setIndentationString((String) pValue);
+ return;
+ }
+ }
+ super.setProperty(pProperty, pValue);
+ }
+
+ @Override
+ public Object getProperty(String pProperty) throws PropertyException {
+ if (pProperty.startsWith("jaxb.")) {
+ if (Marshaller.JAXB_ENCODING.equals(pProperty)) {
+ return getEncoding();
+ } else if (Marshaller.JAXB_FORMATTED_OUTPUT.equals(pProperty)) {
+ return new Boolean(getIndentation());
+ }
+ } else if (pProperty.startsWith("jaxme.")) {
+ if (JAXME_INDENTATION_STRING.equals(pProperty)) {
+ return getIndentationString();
+ } else if (JAXME_XML_WRITER.equals(pProperty)) {
+ return getXMLWriterClass();
+ } else if (JAXME_XML_DECLARATION.equals(pProperty)) {
+ return getEncoding();
+ } else if (JAXME_INDENTATION_SEPARATOR.equals(pProperty)) {
+ return getIndentationSeparator();
+ }
+ }
+ return super.getProperty(pProperty);
}
- super.setProperty(pProperty, pValue);
- }
-
- public Object getProperty(String pProperty) throws PropertyException {
- if (pProperty.startsWith("jaxb.")) {
- if (Marshaller.JAXB_ENCODING.equals(pProperty)) {
- return getEncoding();
- } else if (Marshaller.JAXB_FORMATTED_OUTPUT.equals(pProperty)) {
- return new Boolean(getIndentation());
- }
- } else if (pProperty.startsWith("jaxme.")) {
- if (JAXME_INDENTATION_STRING.equals(pProperty)) {
- return getIndentationString();
- } else if (JAXME_XML_WRITER.equals(pProperty)) {
- return getXMLWriterClass();
- } else if (JAXME_XML_DECLARATION.equals(pProperty)) {
- return getEncoding();
- } else if (JAXME_INDENTATION_SEPARATOR.equals(pProperty)) {
- return getIndentationSeparator();
- }
- }
- return super.getProperty(pProperty);
- }
/* Marshaller methods
@@ -353,6 +377,21 @@
}
}
+ public void marshal(Object pObject, File pFile) throws JAXBException {
+ FileOutputStream fos = null;
+ try {
+ fos = new FileOutputStream(pFile);
+ marshal(pObject, fos);
+ fos.close();
+ fos = null;
+ } catch (IOException e) {
+ throw new JAXBException("I/O error while writing file "
+ + pFile.getPath() + ": " + e.getMessage(), e);
+ } finally {
+ if (fos != null) { try { fos.close(); } catch (Throwable
ignore) {} }
+ }
+ }
+
public void marshal(Object pObject, ContentHandler pHandler) throws
JAXBException {
JMElement element = (JMElement) pObject;
QName qName = element.getQName();
@@ -379,7 +418,7 @@
}
}
XMLWriter w;
- Class c = getXMLWriterClass();
+ Class<?> c = getXMLWriterClass();
try {
w = (XMLWriter) c.newInstance();
} catch (Exception e) {
@@ -430,4 +469,51 @@
public Node getNode(java.lang.Object contentTree) throws JAXBException {
throw new UnsupportedOperationException("JaxMe doesn't support live DOM
views");
}
+
+ public void setListener(Listener pListener) {
+ listener = pListener;
+ }
+
+ public Listener getListener() {
+ return listener;
+ }
+
+ public Schema getSchema() {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ public void setSchema(Schema pSchema) {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ @SuppressWarnings("unchecked")
+ public void setAdapter(XmlAdapter pAdapter) {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ @SuppressWarnings("unchecked")
+ public <A extends XmlAdapter> void setAdapter(Class<A> pType, A
pAdapter) {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ @SuppressWarnings("unchecked")
+ public <A extends XmlAdapter> A getAdapter( Class<A> type ) {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ public void setAttachmentMarshaller(AttachmentMarshaller
pAttachmentMarshaller) {
+ attachmentMarshaller = pAttachmentMarshaller;
+ }
+
+ public AttachmentMarshaller getAttachmentMarshaller() {
+ return attachmentMarshaller;
+ }
+
+ public void marshal(Object pObject, XMLStreamWriter pWriter) throws
JAXBException {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ public void marshal(Object pObject, XMLEventWriter pWriter) throws
JAXBException {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
}
Modified:
webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
---
webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
(original)
+++
webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
Tue Feb 10 21:55:41 2009
@@ -23,16 +23,22 @@
import java.io.Reader;
import java.net.URL;
+import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.UnmarshalException;
import javax.xml.bind.UnmarshallerHandler;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+import javax.xml.bind.attachment.AttachmentUnmarshaller;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
import org.apache.ws.jaxme.JMUnmarshaller;
import org.apache.ws.jaxme.util.DOMSerializer;
@@ -46,15 +52,18 @@
*/
public class JMUnmarshallerImpl extends JMControllerImpl implements
JMUnmarshaller {
private static final SAXParserFactory spf;
- static {
+
+ static {
spf = SAXParserFactory.newInstance();
spf.setValidating(false);
spf.setNamespaceAware(true);
}
private boolean validating;
+ private Listener listener;
+ private AttachmentUnmarshaller attachmentUnmarshaller;
- public boolean isValidating() { return validating; }
+ public boolean isValidating() { return validating; }
public void setValidating(boolean pValidating) { validating = pValidating;
}
public Object unmarshal(URL pURL) throws JAXBException {
@@ -72,12 +81,16 @@
InputSource isource;
try {
isource = new InputSource(new FileInputStream(pFile));
- isource.setSystemId(pFile.toURL().toString());
+ isource.setSystemId(pFile.toURI().toURL().toString());
} catch (IOException e) {
throw new UnmarshalException("Failed to open file " + pFile, e);
}
return unmarshal(isource);
}
+
+ public Object unmarshal(Reader pReader) throws JAXBException {
+ return unmarshal(new InputSource(pReader));
+ }
public Object unmarshal(InputStream pStream) throws JAXBException {
return unmarshal(new InputSource(pStream));
@@ -103,7 +116,7 @@
}
return uh.getResult();
}
-
+
public Object unmarshal(Node pNode) throws JAXBException {
UnmarshallerHandler uh = getUnmarshallerHandler();
DOMSerializer ds = new DOMSerializer();
@@ -177,4 +190,72 @@
public UnmarshallerHandler getUnmarshallerHandler() {
return new JMUnmarshallerHandlerImpl(this);
}
+
+ public Listener getListener() {
+ return listener;
+ }
+
+ public void setListener(Listener pListener) {
+ listener = pListener;
+ }
+
+ public AttachmentUnmarshaller getAttachmentUnmarshaller() {
+ return attachmentUnmarshaller;
+ }
+
+ public void setAttachmentUnmarshaller(AttachmentUnmarshaller
pAttachmentUnmarshaller) {
+ attachmentUnmarshaller = pAttachmentUnmarshaller;
+ }
+
+ @SuppressWarnings("unchecked")
+ public <A extends XmlAdapter> A getAdapter(Class<A> pType) {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ public Schema getSchema() {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ @SuppressWarnings("unchecked")
+ public <A extends XmlAdapter> void setAdapter(Class<A> pType,
+ A pAdapter) {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ @SuppressWarnings("unchecked")
+ public void setAdapter(XmlAdapter pAdapter) {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ public void setSchema(Schema pSchema) {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ public <T> JAXBElement<T> unmarshal(XMLEventReader pReader, Class<T>
pType)
+ throws JAXBException {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ public Object unmarshal(XMLEventReader pReader) throws JAXBException {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ public <T> JAXBElement<T> unmarshal(XMLStreamReader pReader, Class<T>
pType)
+ throws JAXBException {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ public Object unmarshal(XMLStreamReader pReader) throws JAXBException {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ public <T> JAXBElement<T> unmarshal(Node pNode, Class<T> pType)
+ throws JAXBException {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
+
+ public <T> JAXBElement<T> unmarshal(Source pSource, Class<T> pType)
+ throws JAXBException {
+ throw new UnsupportedOperationException("This method is unsupported by
this version of JaxMe.");
+ }
}
Modified: webservices/jaxme/trunk/ws-jaxme/jaxme-js/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-js/pom.xml?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/jaxme-js/pom.xml (original)
+++ webservices/jaxme/trunk/ws-jaxme/jaxme-js/pom.xml Tue Feb 10 21:55:41 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.ws.jaxme</groupId>
<artifactId>jaxme-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>2</version>
</parent>
<artifactId>jaxmejs</artifactId>
<version>0.6-SNAPSHOT</version>
@@ -67,8 +67,8 @@
<dependency>
<groupId>org.apache.ws.jaxme</groupId>
- <artifactId>jaxmeapi</artifactId>
- <version>${version}</version>
+ <artifactId>jaxme-jaxb-2.1-api</artifactId>
+ <version>0.6-SNAPSHOT</version>
</dependency>
</dependencies>
Modified:
webservices/jaxme/trunk/ws-jaxme/jaxme-js/src/main/java/org/apache/ws/jaxme/js/util/AntLinkChecker.java
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-js/src/main/java/org/apache/ws/jaxme/js/util/AntLinkChecker.java?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
---
webservices/jaxme/trunk/ws-jaxme/jaxme-js/src/main/java/org/apache/ws/jaxme/js/util/AntLinkChecker.java
(original)
+++
webservices/jaxme/trunk/ws-jaxme/jaxme-js/src/main/java/org/apache/ws/jaxme/js/util/AntLinkChecker.java
Tue Feb 10 21:55:41 2009
@@ -29,6 +29,7 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.TaskAdapter;
+
/**
* @author <a href="mailto:j...@ispsoft.de";>Jochen Wiedmann</a>
*/
Modified: webservices/jaxme/trunk/ws-jaxme/jaxme-pm/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-pm/pom.xml?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/jaxme-pm/pom.xml (original)
+++ webservices/jaxme/trunk/ws-jaxme/jaxme-pm/pom.xml Tue Feb 10 21:55:41 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.ws.jaxme</groupId>
<artifactId>jaxme-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>2</version>
</parent>
<artifactId>jaxmepm</artifactId>
<version>0.6-SNAPSHOT</version>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.ws.jaxme</groupId>
<artifactId>jaxme2</artifactId>
- <version>${version}</version>
+ <version>0.6-SNAPSHOT</version>
</dependency>
<dependency>
Modified: webservices/jaxme/trunk/ws-jaxme/jaxme-xs/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-xs/pom.xml?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/jaxme-xs/pom.xml (original)
+++ webservices/jaxme/trunk/ws-jaxme/jaxme-xs/pom.xml Tue Feb 10 21:55:41 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.ws.jaxme</groupId>
<artifactId>jaxme-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>2</version>
</parent>
<artifactId>jaxmexs</artifactId>
<version>0.6-SNAPSHOT</version>
@@ -50,8 +50,8 @@
</dependency>
<dependency>
<groupId>org.apache.ws.jaxme</groupId>
- <artifactId>jaxmeapi</artifactId>
- <version>${version}</version>
+ <artifactId>jaxme-jaxb-2.1-api</artifactId>
+ <version>0.6-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: webservices/jaxme/trunk/ws-jaxme/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/pom.xml?rev=743117&r1=743116&r2=743117&view=diff
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/pom.xml (original)
+++ webservices/jaxme/trunk/ws-jaxme/pom.xml Tue Feb 10 21:55:41 2009
@@ -38,7 +38,7 @@
the schema (marshalling) and, vice versa, compliant XML instances
into Java objects (unmarshalling).
</description>
- <version>0.6-SNAPSHOT</version>
+ <version>2</version>
<url>http://ws.apache.org/jaxme</url>
<issueManagement>
<system>jira</system>
@@ -110,8 +110,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.3</source>
- <target>1.3</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
</plugins>
@@ -155,7 +155,7 @@
</distributionManagement>
<modules>
- <module>jaxme-api</module>
+ <module>jaxme-jaxb-api</module>
<module>jaxme-js</module>
<module>jaxme-pm</module>
<module>jaxme-jm</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscr...@ws.apache.org
For additional commands, e-mail: jaxme-dev-h...@ws.apache.org
