You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by da...@apache.org on 2004/08/11 05:02:52 UTC
cvs commit: xml-xmlbeans/v2/test/cases/xbean/marshal/com/mytest IntEnum.java IntegerEnum.java ModeEnum.java MyClass.java MyException.java MySubClass.java MySubSubClass.java SimpleContentExample.java
daveremy 2004/08/10 20:02:52
Modified: v2 build.xml testbuild.xml
Removed: v2/src/binding/org/apache/xmlbeans/impl/binding/bts
BaseBindingLoader.java BindingFile.java
BindingFileUtils.java BindingLoader.java
BindingProperty.java BindingType.java
BindingTypeName.java BindingTypeVisitor.java
BuiltinBindingLoader.java BuiltinBindingType.java
ByNameBean.java CompositeBindingLoader.java
DefaultBuiltinBindingLoader.java
FactoryRegistry.java GenericXmlProperty.java
JavaInstanceFactory.java JavaTypeName.java
JaxRpcBuiltinBindingLoader.java JaxrpcEnumType.java
ListArrayType.java MethodName.java
ParentInstanceFactory.java PropertyRegistry.java
QNameProperty.java SimpleBindingType.java
SimpleContentBean.java SimpleContentProperty.java
SimpleDocumentBinding.java SoapArrayType.java
TypeRegistry.java WrappedArrayType.java
XmlTypeName.java
v2/src/binding/org/apache/xmlbeans/impl/binding/compile
BindingCompiler.java BindingCompilerTask.java
Both2Bind.java Both2BindTask.java
DefaultTypeMatcher.java EnumerationPrintHelper.java
Java2Schema.java Java2SchemaTask.java
Schema2Java.java Schema2JavaTask.java
TypeMatcher.java TypeMatcherContext.java
v2/src/binding/org/apache/xmlbeans/impl/binding/compile/internal
Java2SchemaAnnotationHelper.java
v2/src/binding/org/apache/xmlbeans/impl/binding/compile/internal/annotations
ClassBindingInfo.java ElementTarget.java
NamedTarget.java TopLevelElementTarget.java
TypeTarget.java
v2/src/binding/org/apache/xmlbeans/impl/binding/joust
Annotation.java AnnotationImpl.java
CompilingJavaOutputStream.java Expression.java
ExpressionFactory.java FileWriterFactory.java
JavaOutputStream.java SourceJavaOutputStream.java
ValidatingJavaOutputStream.java Variable.java
WriterFactory.java
v2/src/binding/org/apache/xmlbeans/impl/binding/logger
BindingLogger.java Message.java MessageImpl.java
MessageSink.java SimpleMessageSink.java
v2/src/binding/org/apache/xmlbeans/impl/binding/tylar
BaseTylarImpl.java CompositeTylar.java
DebugTylarWriter.java DefaultTylarLoader.java
ExplodedTylar.java ExplodedTylarImpl.java
RuntimeTylar.java Tylar.java TylarConstants.java
TylarImpl.java TylarLoader.java TylarWriter.java
v2/src/marshal/org/apache/xmlbeans/impl/marshal
AnySimpleTypeConverter.java
AnyTypeRuntimeBindingType.java
AnyUriToStringTypeConverter.java
AnyUriToUriTypeConverter.java
AttributeRuntimeBindingType.java
AttributeUnmarshaller.java
Base64BinaryTypeConverter.java
BaseSimpleTypeConverter.java
BindingContextFactoryImpl.java
BindingContextImpl.java BooleanTypeConverter.java
BuiltinRuntimeBindingType.java
BuiltinSchemaTypeLoaderProvider.java
ByNameRuntimeBindingType.java
ByNameTypeVisitor.java ByNameUnmarshaller.java
ByteTypeConverter.java CharacterVisitor.java
ClassLoadingUtils.java
CollapseStringTypeConverter.java
DecimalTypeConverter.java DoubleTypeConverter.java
DurationTypeConverter.java EmptyLocation.java
EmptyNamespaceContext.java
FailFastErrorHandler.java FloatTypeConverter.java
HexBinaryTypeConverter.java
IntDateTypeConverter.java IntTypeConverter.java
IntegerToIntTypeConverter.java
IntegerTypeConverter.java
JavaCalendarTypeConverter.java
JavaDateTypeConverter.java
JaxrpcEnumMarsahller.java
JaxrpcEnumRuntimeBindingType.java
JaxrpcEnumUnmarshaller.java ListArrayConverter.java
ListArrayRuntimeBindingType.java
LiteralMarshalResult.java
LiteralPushMarshalResult.java
LiteralUnmarshalResult.java LongTypeConverter.java
MarshalResult.java MarshalStreamUtils.java
MarshallerImpl.java NamedXmlTypeVisitor.java
NamespaceTests.java NullUnmarshaller.java
ObjectAnyTypeConverter.java ObjectRefTable.java
PreserveStringTypeConverter.java
PullMarshalResult.java PullSoapMarshalResult.java
PushMarshalResult.java PushSoap11MarshalResult.java
PushSoapMarshalResult.java QNameTypeConverter.java
RefObjectTable.java RefdObjectVisitor.java
ReplaceStringTypeConverter.java
RuntimeBindingProperty.java RuntimeBindingType.java
RuntimeBindingTypeTable.java
RuntimeGlobalProperty.java RuntimeTypeVisitor.java
SchemaTypeLoaderProvider.java
ScopedNamespaceContext.java ShortTypeConverter.java
SimpleContentBeanMarshaller.java
SimpleContentRuntimeBindingType.java
SimpleContentTypeVisitor.java
SimpleContentUnmarshaller.java
SimpleContentVisitor.java
SimpleRuntimeBindingType.java
SimpleTypeVisitor.java Soap11Constants.java
Soap11MarshalResult.java
Soap11RefdObjectVisitor.java
Soap11UnmarshalResult.java
SoapArrayRuntimeBindingType.java
SoapArrayTypeVisitor.java
SoapArrayUnmarshaller.java SoapMarshallerImpl.java
SoapUnmarshalResult.java SoapUnmarshallerImpl.java
StreamRefNavigator.java
StringListArrayConverter.java
StringTypeConverter.java
TylarSchemaTypeLoaderProvider.java
TypeConverter.java TypeMarshaller.java
TypeUnmarshaller.java UnmarshalResult.java
UnmarshallerImpl.java
UnusedSchemaTypeLoaderProvider.java
WrappedArrayRuntimeBindingType.java
WrappedArrayTypeVisitor.java
WrappedArrayUnmarshaller.java XmlTypeVisitor.java
XsiAttributeHolder.java
v2/src/marshal/org/apache/xmlbeans/impl/marshal/util
ArrayUtils.java AttrCache.java AttributeHolder.java
ReflectionUtils.java
v2/src/marshal/org/apache/xmlbeans/impl/marshal/util/collections
Accumulator.java AccumulatorFactory.java
ArrayIterator.java
ArrayListBasedObjectAccumulator.java
BooleanList.java ByteList.java CharList.java
DoubleList.java EmptyIterator.java FloatList.java
GenericCollectionObjectAccumulator.java
HashSetBasedObjectAccumulator.java IntList.java
LinkedListBasedObjectAccumulator.java LongList.java
ObjectAccumulator.java ReflectiveArrayIterator.java
ShortList.java StackBasedObjectAccumulator.java
StringList.java TreeSetBasedObjectAccumulator.java
VectorBasedObjectAccumulator.java
v2/src/xmlpublic/org/apache/xmlbeans BindingContext.java
BindingContextFactory.java EncodingStyle.java
Marshaller.java SoapMarshaller.java
SoapUnmarshaller.java Unmarshaller.java
v2/test/cases/xbean/marshal bigdoc.xml doc.xml doc2.xml
doc3.xml example.xsd example_config.xml
example_instance.xml example_instance2.xml
v2/test/cases/xbean/marshal/com/mytest IntEnum.java
IntegerEnum.java ModeEnum.java MyClass.java
MyException.java MySubClass.java MySubSubClass.java
SimpleContentExample.java
Log:
removing binding/marshal source and tests
Contributed by Kevin Krouse
Revision Changes Path
1.82 +5 -105 xml-xmlbeans/v2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/build.xml,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- build.xml 7 Aug 2004 20:19:35 -0000 1.81
+++ build.xml 11 Aug 2004 03:02:41 -0000 1.82
@@ -292,7 +292,7 @@
<target name="xbean.jar"
depends="dirs, xmlpublic.classes, typestore.classes, common.classes,
typeimpl.classes, xmlcomp.classes, xmlstore.classes,
- newstore2.classes, saaj_api.classes, binding.classes,
+ newstore2.classes, saaj_api.classes,
marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
xmlinputstream.classes, resolver.jar, xbean_xpath.jar,
piccolo.classes, tools.classes">
@@ -310,7 +310,6 @@
<fileset dir="build/classes/newstore2"/>
<fileset dir="build/classes/saaj_api"/>
<fileset dir="build/classes/xmlinputstream"/>
- <fileset dir="build/classes/binding"/>
<fileset dir="build/classes/marshal"/>
<fileset dir="build/classes/repackage"/>
<fileset dir="build/classes/jam"/>
@@ -446,30 +445,8 @@
</javac>
</target>
- <!-- binding target =============================================== -->
- <target name="binding.classes" depends="dirs, repackage.classes, typeimpl.classes, xmlpublic.classes, typestore.classes, configschema.classes, xmlcomp.classes, jam, jsr173.jar">
- <mkdir dir="build/classes/binding"/>
- <javac srcdir="src/binding" destdir="build/classes/binding" source="${javac.source}" target="${javac.target}" debug="on">
- <classpath>
- <pathelement location="build/lib/jsr173_api.jar"/>
- <pathelement location="build/classes/configschema"/>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/xmlpublic"/>
- <pathelement location="build/classes/common"/>
- <pathelement location="build/classes/repackage"/>
- <pathelement location="build/classes/typeimpl"/>
- <pathelement location="build/classes/typestore"/>
- <pathelement location="build/classes/xmlconfig"/>
- <pathelement location="build/classes/configschema"/>
- <pathelement location="build/classes/toolschema"/>
- <pathelement location="build/classes/xsdschema"/>
- <pathelement location="build/classes/jam"/>
- <pathelement location="build/classes/xmlcomp"/>
- </classpath>
- </javac>
-
- </target>
+ <!-- jam target =================================================== -->
<target name='jam'>
<ant dir='${jam_root}' target='all' inheritAll='false'>
@@ -479,7 +456,7 @@
<!-- marshal target =============================================== -->
- <target name="marshal.classes" depends="dirs, binding.classes, typeimpl.classes, xmlpublic.classes, jsr173_api.jar">
+ <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes, jsr173_api.jar">
<mkdir dir="build/classes/marshal"/>
<javac srcdir="src/marshal" destdir="build/classes/marshal" source="${javac.source}" target="${javac.target}" debug="on">
<classpath>
@@ -490,7 +467,7 @@
<pathelement location="build/classes/common"/>
<pathelement location="build/classes/binding"/>
<pathelement location="build/classes/typeimpl"/>
- <pathelement location="build/classes/newstore2"/>
+ <pathelement location="build/classes/newstore2"/>
</classpath>
</javac>
</target>
@@ -867,10 +844,6 @@
<target name="checkintest">
<ant antfile="${testbuild.file}" target="checkin"/>
-<!--
- <antcall target="marshal-drt"/>
- <antcall target="binding-drt"/>
--->
</target>
<target name="detailed">
@@ -879,37 +852,12 @@
- <!-- test marshal target ============================================= -->
-
- <target name="test_marshal.classes" depends="marshal.classes">
- <mkdir dir="build/private/classes/marshal"/>
- <javac
- srcdir="test/cases/xbean/marshal"
- destdir="build/private/classes/marshal"
- source="${javac.source}" target="${javac.target}"
- debug="on">
- <classpath>
- <pathelement location="build/classes/binding"/>
- <pathelement location="build/classes/marshal"/>
- <pathelement location="build/classes/common"/>
- <pathelement location="build/classes/configschema"/>
- <pathelement location="build/classes/typeimpl"/>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/xmlpublic"/>
- <pathelement location="build/lib/jsr173_api.jar"/>
- <pathelement location="build/lib/xmlpublic.jar"/>
- </classpath>
- </javac>
- </target>
-
<path id="test.compile.path">
- <pathelement location="build/classes/binding"/>
<pathelement location="build/classes/marshal"/>
<pathelement location="build/classes/common"/>
<pathelement location="external/lib/junit.jar"/>
<pathelement location="build/ar/xbean.jar"/>
<pathelement location="build/lib/jsr173_api.jar"/>
- <pathelement location="build/private/classes/marshal"/>
<pathelement location="build/classes/xmlinputstream"/>
</path>
@@ -919,61 +867,13 @@
</path>
- <target name="marshal-drt" depends="drt.jar, runmarshal-drt"/>
- <path id="run.marshal.drt">
- <pathelement location="external/lib/junit.jar"/>
- <pathelement location="build/ar/xbean.jar"/>
- <pathelement location="build/lib/jsr173_api.jar"/>
- <pathelement location="build/lib/jsr173_ri.jar"/>
- <pathelement location="build/private/lib/drt.jar"/>
- <pathelement location="build/private/classes/marshal"/>
- </path>
-
- <property name="drt.marshal.out" value="build/test/output/drt-marshal-product"/>
- <target name="runmarshal-drt" >
-
- <junit fork="yes" printsummary="yes" haltonfailure="yes" showoutput="yes">
- <jvmarg value="-ea"/>
- <sysproperty key="xbean.rootdir" value="${basedir}"/>
- <sysproperty key="treeasserts" value="true"/>
- <classpath refid="run.marshal.drt"/>
- <formatter type="plain"/>
- <test name="drt.drtcases.MarshalTests" outfile="${drt.marshal.out}" />
- </junit>
- </target>
-
- <target name="binding-drt" depends="drt.jar, runbinding-drt"/>
-
- <property name="drt.binding.out" value="build/test/output/drt-bind-product"/>
- <target name="runbinding-drt" >
-
- <junit fork="yes" printsummary="yes" haltonfailure="yes" showoutput="yes">
- <jvmarg value="-ea"/>
- <sysproperty key="xbean.rootdir" value="${basedir}"/>
- <sysproperty key="treeasserts" value="true"/>
- <classpath>
- <pathelement location="external/lib/junit.jar"/>
- <pathelement location="build/ar/xbean.jar"/>
- <pathelement location="build/lib/jsr173_api.jar"/>
- <pathelement location="build/lib/jsr173_ri.jar"/>
- <pathelement location="build/private/lib/drt.jar"/>
- </classpath>
- <formatter type="plain"/>
- <test name="drt.drtcases.BindingTests" outfile="${drt.binding.out}" />
- </junit>
- </target>
-
-
-
-
- <target name="drt.classes" depends="dirs,test_marshal.classes, jsr173_ri.jar">
+ <target name="drt.classes" depends="dirs,jsr173_ri.jar">
<mkdir dir="build/private/classes/drt"/>
<javac
destdir="build/private/classes/drt"
classpathref="test.compile.path"
source="${javac.source}" target="${javac.target}"
debug="on">
- <src path="test/cases/xbean/marshal"/>
<src path="test/src/drt"/>
</javac>
</target>
1.27 +0 -3 xml-xmlbeans/v2/testbuild.xml
Index: testbuild.xml
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/testbuild.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- testbuild.xml 6 Aug 2004 19:53:59 -0000 1.26
+++ testbuild.xml 11 Aug 2004 03:02:41 -0000 1.27
@@ -36,7 +36,6 @@
<property name="xbeans.test.tools" value="${xbeans.test.root}/tools"/>
<property name="xbeans.test.tools.lib" value="${xbeans.test.tools}/lib"/>
<property name="xbeans.test.tools.src" value="${xbeans.test.tools}/src"/>
- <property name="build.dir.test.marshalling" value="${build.dir.test}/classes/marshal"/>
<property name="asserts" value="on"/>
@@ -199,7 +198,6 @@
<pathelement path="${build.dir.test.lib}/testcases.jar"/>
<pathelement path="${build.dir.test.lib}/testtools.jar"/>
<pathelement path="${build.lib}/xbean_xpath.jar"/>
- <pathelement location="${build.dir.test.marshalling}"/>
<path refid="build.classpath"/>
<fileset refid="test.build.jars"/>
@@ -219,7 +217,6 @@
<property name="schema.dirs"
value="${build.dir.test.schemas}/xbean/simple/dumb,
${build.dir.test.schemas}/xbean/simple/dupSchemaElements,
- ${build.dir.test.schemas}/xbean/misc/marshal,
${build.dir.test.schemas}/xbean/xmlcursor,
${build.dir.test.schemas}/xbean/xmlcursor/xstypes,
${build.dir.test.schemas}/xbean/dom,
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org