[Jpackage-commits] dist/sun-jaxb-1.0/devel .cvsignore, 1.1, 1.2 jaxb-api-1.0.6.pom, NONE, 1.1 jaxb-impl-1.0.6.pom, NONE, 1.1 jaxb-libs-1.0.6.pom, NONE, 1.1 jaxb-xjc-1.0.6.pom, NONE, 1.1 sources, 1.1, 1.2 sun-jaxb-1.0-api-build.xml, NONE, 1.1 sun-jaxb-1.0-build.patch, NONE, 1.1 sun-jaxb-1.0-runtime-build.patch, NONE, 1.1 sun-jaxb-1.0-xjc-AGMFragmentBuilder.patch, NONE, 1.1 sun-jaxb-1.0-xjc-BIProperty.patch, NONE, 1.1 sun-jaxb-1.0-xjc-ConversionFinder.patch, NONE, 1.1 sun-jaxb-1.0-xjc-DOMBinder.patch, NONE, 1.1 sun-jaxb-1.0-xjc-DefaultClassBinder.patch, NONE, 1.1 sun-jaxb-1.0-xjc-FieldBuilder.patch, NONE, 1.1 sun-jaxb-1.0-xjc-ModelGroupBindingClassBinder.patch, NONE, 1.1 sun-jaxb-1.0-xjc-Options.patch, NONE, 1.1 sun-jaxb-1.0-xjc-SimpleTypeBuilder.patch, NONE, 1.1 sun-jaxb-1.0-xjc-TypeBuilder.patch, NONE, 1.1 sun-jaxb-1.0-xjc-UnusedCustomizationChecker.patch, NONE, 1.1 sun-jaxb-1.0-xjc-WhitespaceTransducer.patch, NONE, 1.1 sun-jaxb-1.0.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed May 28 21:54:06 CEST 2008


Update of /home/projects/jpackage/cvs/dist/sun-jaxb-1.0/devel
In directory ryu.zarb.org:/tmp/cvs-serv32290/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jaxb-api-1.0.6.pom jaxb-impl-1.0.6.pom jaxb-libs-1.0.6.pom 
	jaxb-xjc-1.0.6.pom sun-jaxb-1.0-api-build.xml 
	sun-jaxb-1.0-build.patch sun-jaxb-1.0-runtime-build.patch 
	sun-jaxb-1.0-xjc-AGMFragmentBuilder.patch 
	sun-jaxb-1.0-xjc-BIProperty.patch 
	sun-jaxb-1.0-xjc-ConversionFinder.patch 
	sun-jaxb-1.0-xjc-DOMBinder.patch 
	sun-jaxb-1.0-xjc-DefaultClassBinder.patch 
	sun-jaxb-1.0-xjc-FieldBuilder.patch 
	sun-jaxb-1.0-xjc-ModelGroupBindingClassBinder.patch 
	sun-jaxb-1.0-xjc-Options.patch 
	sun-jaxb-1.0-xjc-SimpleTypeBuilder.patch 
	sun-jaxb-1.0-xjc-TypeBuilder.patch 
	sun-jaxb-1.0-xjc-UnusedCustomizationChecker.patch 
	sun-jaxb-1.0-xjc-WhitespaceTransducer.patch sun-jaxb-1.0.spec 
Log Message:
Import from JPP 5.0

--- NEW FILE: jaxb-impl-1.0.6.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.sun.xml</groupId>
  <artifactId>jaxb-impl</artifactId>
  <version>1.0.6</version>
  <name>JAXB XML Binding Implementation Package</name>
  <description>
    Part of the Java Web Services Developer Pack 1.6
  </description>
  <url>http://java.sun.com/xml/jaxb/index.jsp</url>
  <dependencies>
    <dependency>
      <groupId>javax.xml.bind</groupId>
      <artifactId>jaxb-api</artifactId>
      <version>1.0.6</version>
    </dependency>
    <dependency>
      <groupId>com.sun.xml</groupId>
      <artifactId>relaxngDatatype</artifactId>
      <version>1.0</version>
    </dependency>
  </dependencies>  
  <distributionManagement>
    <downloadUrl>http://java.sun.com/webservices/downloads/webservicespack.html</downloadUrl>
  </distributionManagement>
</project>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/sun-jaxb-1.0/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 19:53:29 -0000	1.1
--- sources	28 May 2008 19:54:04 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ 47b3e1ff3bff833432f0949c1f3e1076  jaxb-1.0.6.tar.gz
+ 40401589fa8d80d344084e27120a9abe  xsom-20050414.tar.gz

--- NEW FILE: jaxb-api-1.0.6.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>javax.xml.bind</groupId>
  <artifactId>jaxb-api</artifactId>
  <version>1.0.6</version>
  <name>JAXB XML Binding API Package</name>
  <description>
    Part of the Java Web Services Developer Pack 1.6
  </description>
  <url>http://java.sun.com/xml/jaxb/index.jsp</url>
  <distributionManagement>
    <downloadUrl>http://java.sun.com/webservices/downloads/webservicespack.html</downloadUrl>
  </distributionManagement>
</project>

--- NEW FILE: sun-jaxb-1.0-xjc-DefaultClassBinder.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/cs/DefaultClassBinder.java.sav5	2005-09-10 20:20:38.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/cs/DefaultClassBinder.java	2008-03-09 19:10:34.000000000 +0100
@@ -40,6 +40,7 @@
 import com.sun.xml.xsom.XSContentType;
 import com.sun.xml.xsom.XSElementDecl;
 import com.sun.xml.xsom.XSFacet;
+import com.sun.xml.xsom.XSIdentityConstraint;
 import com.sun.xml.xsom.XSModelGroup;
 import com.sun.xml.xsom.XSModelGroupDecl;
 import com.sun.xml.xsom.XSNotation;
@@ -47,6 +48,7 @@
 import com.sun.xml.xsom.XSSchema;
 import com.sun.xml.xsom.XSSimpleType;
 import com.sun.xml.xsom.XSWildcard;
+import com.sun.xml.xsom.XSXPath;
 /**
  * Default classBinder implementation. Honors <jaxb:class> customizations
  * and default bindings.
@@ -177,6 +179,14 @@
         _assert(false);
         return null;
     }
+    public Object xpath(XSXPath xp) {
+        _assert(false);
+        return null;
+    }
+    public Object identityConstraint(XSIdentityConstraint decl) {
+        _assert(false);
+        return null;
+    }
     
     
     /**
@@ -291,4 +301,4 @@
         
         return ci;
     }
-};
\ No newline at end of file
+};

--- NEW FILE: sun-jaxb-1.0-xjc-BIProperty.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty.java.sav11	2005-09-27 02:37:21.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty.java	2008-03-09 19:56:56.000000000 +0100
@@ -40,12 +40,14 @@
 import com.sun.xml.xsom.XSComponent;
 import com.sun.xml.xsom.XSContentType;
 import com.sun.xml.xsom.XSElementDecl;
+import com.sun.xml.xsom.XSIdentityConstraint;
 import com.sun.xml.xsom.XSModelGroup;
 import com.sun.xml.xsom.XSModelGroupDecl;
 import com.sun.xml.xsom.XSParticle;
 import com.sun.xml.xsom.XSSchema;
 import com.sun.xml.xsom.XSSimpleType;
 import com.sun.xml.xsom.XSWildcard;
+import com.sun.xml.xsom.XSXPath;
 import com.sun.xml.xsom.util.XSFinder;
 import com.sun.xml.xsom.visitor.XSFunction;
 
@@ -321,15 +323,15 @@
             return b?Boolean.TRUE:Boolean.FALSE;
         }
         
-        public Object attributeDecl(XSAttributeDecl decl) {
+        public Boolean attributeDecl(XSAttributeDecl decl) {
             return toBoolean(decl.getFixedValue()!=null);
         }
 
-        public Object attributeUse(XSAttributeUse use) {
+        public Boolean attributeUse(XSAttributeUse use) {
             return toBoolean(use.getFixedValue()!=null);
         }
         
-        public Object schema(XSSchema s) {
+        public Boolean schema(XSSchema s) {
             // we allow globalBindings to have isConstantProperty==true,
             // so this method returns true to allow this.
             return Boolean.TRUE;
@@ -421,6 +423,14 @@
             return null;
         }
 
+        public Object identityConstraint(XSIdentityConstraint decl) {
+            return null;
+        }
+
+        public Object xpath(XSXPath xpath) {
+            return null;
+        }
+
         // delegates to the context schema object
         public Object attributeDecl(XSAttributeDecl decl) { return decl.getOwnerSchema(); }
         public Object wildcard(XSWildcard wc) { return wc.getOwnerSchema(); }

--- NEW FILE: sun-jaxb-1.0-build.patch ---
--- jaxb-ri/build.xml.sav12	2006-01-25 03:14:25.000000000 +0100
+++ jaxb-ri/build.xml	2008-03-10 13:16:59.000000000 +0100
@@ -84,7 +84,9 @@
         <echo message="The build id is: ${build.version}" />
 
         <!-- download all necessary libs -->
+<!--
         <ant dir="tools/lib" target="prepare-libs" />
+-->
         
         <property name="installer.suffix" value="${DSTAMP}"/>
         <property name="installer.classname.suffix" value="${DSTAMP}"/>
@@ -536,15 +538,21 @@
     <target name="javadoc"
             description="generate javadocs for spec and codemodel then copy to jaxb-ri/docs">
         <ant dir="codemodel" target="javadoc-codemodel" />
+        <ant dir="runtime" target="javadoc" />
+        <ant dir="xjc" target="javadoc-xjc" />
+<!--
         <ant dir="spec"      target="javadoc-spec" />
+-->
         <mkdir dir="${jaxb.docs}/api/codemodel" />
         <mkdir dir="${jaxb.docs}/api/spec" />
         <copy todir="${jaxb.docs}/api/codemodel">
             <fileset dir="${codemodel.docs}/api"/>
         </copy>
+<!--
         <copy todir="${jaxb.docs}/api/spec">
             <fileset dir="${spec.docs}/api"/>
         </copy>
+-->
     </target>
 
 

--- NEW FILE: sun-jaxb-1.0-xjc-ModelGroupBindingClassBinder.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/cs/ModelGroupBindingClassBinder.java.sav3	2005-09-10 20:20:38.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/cs/ModelGroupBindingClassBinder.java	2008-03-09 19:06:05.000000000 +0100
@@ -35,6 +35,7 @@
 import com.sun.xml.xsom.XSContentType;
 import com.sun.xml.xsom.XSElementDecl;
 import com.sun.xml.xsom.XSFacet;
+import com.sun.xml.xsom.XSIdentityConstraint;
 import com.sun.xml.xsom.XSModelGroup;
 import com.sun.xml.xsom.XSModelGroupDecl;
 import com.sun.xml.xsom.XSNotation;
@@ -42,6 +43,7 @@
 import com.sun.xml.xsom.XSSchema;
 import com.sun.xml.xsom.XSSimpleType;
 import com.sun.xml.xsom.XSWildcard;
+import com.sun.xml.xsom.XSXPath;
 /**
  * Special Checker that adds choice content interface semantics
  * to another ClassBinder.
@@ -195,4 +197,10 @@
     public Object wildcard(XSWildcard wc) {
         return base.wildcard(wc);
     }
-}
\ No newline at end of file
+    public Object xpath(XSXPath xp) {
+        return null;
+    }
+    public Object identityConstraint(XSIdentityConstraint decl) {
+        return null;
+    }
+}

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/sun-jaxb-1.0/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 19:53:29 -0000	1.1
--- .cvsignore	28 May 2008 19:54:04 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ jaxb-1.0.6.tar.gz
+ xsom-20050414.tar.gz

--- NEW FILE: sun-jaxb-1.0-xjc-AGMFragmentBuilder.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/cs/AGMFragmentBuilder.java.sav9	2005-09-10 20:20:37.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/cs/AGMFragmentBuilder.java	2008-03-09 19:18:16.000000000 +0100
@@ -47,12 +47,14 @@
 import com.sun.xml.xsom.XSComponent;
 import com.sun.xml.xsom.XSContentType;
 import com.sun.xml.xsom.XSElementDecl;
+import com.sun.xml.xsom.XSIdentityConstraint;
 import com.sun.xml.xsom.XSModelGroup;
 import com.sun.xml.xsom.XSModelGroupDecl;
 import com.sun.xml.xsom.XSParticle;
 import com.sun.xml.xsom.XSSimpleType;
 import com.sun.xml.xsom.XSTerm;
 import com.sun.xml.xsom.XSWildcard;
+import com.sun.xml.xsom.XSXPath;
 
 /**
  * Builds the exact AGM representation of a ClassItem
@@ -239,6 +241,14 @@
         return new WildcardItem(builder.grammar.codeModel,wc);
     }
     
+    public Object identityConstraint(XSIdentityConstraint decl) {
+        return null;
+    }
+    
+    public Object xpath(XSXPath xpath) {
+        return null;
+    }
+
     private Expression recurse( XSComponent sc) {
         return recurse(sc,true);
     }

--- NEW FILE: jaxb-libs-1.0.6.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.sun.xml</groupId>
  <artifactId>jaxb-libs</artifactId>
  <version>1.0.6</version>
  <name>JAXB XML Binding Libraries Package</name>
  <description>
    Part of the Java Web Services Developer Pack 1.6
  </description>
  <url>http://java.sun.com/xml/jaxb/index.jsp</url>
  <distributionManagement>
    <downloadUrl>http://java.sun.com/webservices/downloads/webservicespack.html</downloadUrl>
  </distributionManagement>
</project>

--- NEW FILE: sun-jaxb-1.0-xjc-FieldBuilder.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/FieldBuilder.java.sav8	2005-09-10 20:20:34.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/FieldBuilder.java	2008-03-09 19:58:31.000000000 +0100
@@ -55,12 +55,16 @@
 import com.sun.xml.xsom.XSContentType;
 import com.sun.xml.xsom.XSDeclaration;
 import com.sun.xml.xsom.XSElementDecl;
+import com.sun.xml.xsom.XSIdentityConstraint;
 import com.sun.xml.xsom.XSModelGroup;
 import com.sun.xml.xsom.XSModelGroupDecl;
 import com.sun.xml.xsom.XSParticle;
 import com.sun.xml.xsom.XSSimpleType;
 import com.sun.xml.xsom.XSTerm;
 import com.sun.xml.xsom.XSWildcard;
+import com.sun.xml.xsom.XSXPath;
+import com.sun.xml.xsom.impl.AnnotationImpl;
+import com.sun.xml.xsom.impl.ForeignAttributesImpl;
 import com.sun.xml.xsom.impl.ModelGroupImpl;
 import com.sun.xml.xsom.impl.ParticleImpl;
 import com.sun.xml.xsom.impl.Ref;
@@ -237,7 +241,14 @@
     }
 
 
-    
+    public Object identityConstraint(XSIdentityConstraint decl) {
+        return null;
+    }
+
+    public Object xpath(XSXPath xpath) {
+        return null;
+    }
+
     
     public Object complexType(XSComplexType type) {
         return builder.complexTypeBuilder.build(type);
@@ -335,10 +346,9 @@
         } else {
             // make a shallow copy of this model group so that the class customization
             // attached to this model group won't be recognized by the particle builder.
-            XSModelGroup mg2 = new ModelGroupImpl(
-                (SchemaImpl)mg.getOwnerSchema(), null, mg.getLocator(),
-                mg.getCompositor(), mg.getChildren() );
-            
+              XSModelGroup mg2 = new ModelGroupImpl(
+                (SchemaImpl)mg.getOwnerSchema(), (AnnotationImpl)null, mg.getLocator(),
+                (ForeignAttributesImpl)null, mg.getCompositor(), (ParticleImpl[])mg.getChildren() );
             return particle( makeParticle(mg2), null );
         }
     }

--- NEW FILE: sun-jaxb-1.0-xjc-SimpleTypeBuilder.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/SimpleTypeBuilder.java.sav7	2005-09-10 20:20:35.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/SimpleTypeBuilder.java	2008-03-09 19:13:56.000000000 +0100
@@ -263,16 +263,16 @@
             int max=-1; // unbounded
             XSFacet length = originalType.getFacet("length");
             if(length!=null) {
-                int v = PositiveIntegerType.load(length.getValue()).intValue();
+                int v = PositiveIntegerType.load(length.getValue().toString()).intValue();
                 min = max = v;
             } else {
                 XSFacet minLength = originalType.getFacet("minLength");
                 if(minLength!=null) {
-                    min = PositiveIntegerType.load(minLength.getValue()).intValue();
+                    min = PositiveIntegerType.load(minLength.getValue().toString()).intValue();
                 }
                 XSFacet maxLength = originalType.getFacet("maxLength");
                 if(maxLength!=null) {
-                    String v = maxLength.getValue().trim();
+                    String v = maxLength.getValue().toString().trim();
                     if(v.equals("unbounded"))   max=-1;
                     else
                         max = PositiveIntegerType.load(v).intValue();

--- NEW FILE: sun-jaxb-1.0-xjc-TypeBuilder.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/TypeBuilder.java.sav10	2005-09-10 20:20:35.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/TypeBuilder.java	2008-03-09 19:19:51.000000000 +0100
@@ -43,11 +43,13 @@
 import com.sun.xml.xsom.XSComponent;
 import com.sun.xml.xsom.XSContentType;
 import com.sun.xml.xsom.XSElementDecl;
+import com.sun.xml.xsom.XSIdentityConstraint;
 import com.sun.xml.xsom.XSModelGroup;
 import com.sun.xml.xsom.XSModelGroupDecl;
 import com.sun.xml.xsom.XSParticle;
 import com.sun.xml.xsom.XSSimpleType;
 import com.sun.xml.xsom.XSWildcard;
+import com.sun.xml.xsom.XSXPath;
 
 /**
  * Builds an expression that has {@link TypeItem} as its top-level
@@ -77,6 +79,13 @@
     private final ExpressionPool pool;
 
 
+    public Object identityConstraint(XSIdentityConstraint decl) {
+        return null;
+    }
+
+    public Object xpath(XSXPath xpath) {
+        return null;
+    }
 
 
     public Object attGroupDecl(XSAttGroupDecl agd) {

--- NEW FILE: sun-jaxb-1.0-xjc-UnusedCustomizationChecker.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/UnusedCustomizationChecker.java.sav6	2005-09-10 20:20:35.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/UnusedCustomizationChecker.java	2008-03-09 19:12:35.000000000 +0100
@@ -34,6 +34,7 @@
 import com.sun.xml.xsom.XSContentType;
 import com.sun.xml.xsom.XSElementDecl;
 import com.sun.xml.xsom.XSFacet;
+import com.sun.xml.xsom.XSIdentityConstraint;
 import com.sun.xml.xsom.XSListSimpleType;
 import com.sun.xml.xsom.XSModelGroup;
 import com.sun.xml.xsom.XSModelGroupDecl;
@@ -44,6 +45,7 @@
 import com.sun.xml.xsom.XSSimpleType;
 import com.sun.xml.xsom.XSUnionSimpleType;
 import com.sun.xml.xsom.XSWildcard;
+import com.sun.xml.xsom.XSXPath;
 import com.sun.xml.xsom.visitor.XSSimpleTypeVisitor;
 import com.sun.xml.xsom.visitor.XSVisitor;
 
@@ -164,6 +166,10 @@
         check(wc);
     }
 
+    public void identityConstraint( XSIdentityConstraint decl) {}
+
+    public void xpath(XSXPath xp) {}
+
     public void modelGroupDecl(XSModelGroupDecl decl) {
         if(check(decl))
             decl.getModelGroup().visit(this);

--- NEW FILE: sun-jaxb-1.0-xjc-DOMBinder.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/cs/DOMBinder.java.sav4	2005-09-10 20:20:38.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/cs/DOMBinder.java	2008-03-09 19:08:22.000000000 +0100
@@ -36,12 +36,14 @@
 import com.sun.xml.xsom.XSComponent;
 import com.sun.xml.xsom.XSContentType;
 import com.sun.xml.xsom.XSElementDecl;
+import com.sun.xml.xsom.XSIdentityConstraint;
 import com.sun.xml.xsom.XSModelGroup;
 import com.sun.xml.xsom.XSModelGroupDecl;
 import com.sun.xml.xsom.XSParticle;
 import com.sun.xml.xsom.XSSimpleType;
 import com.sun.xml.xsom.XSTerm;
 import com.sun.xml.xsom.XSWildcard;
+import com.sun.xml.xsom.XSXPath;
 import com.sun.xml.xsom.visitor.XSTermFunction;
 
 /**
@@ -209,4 +211,12 @@
     public Object empty(XSContentType empty) {
         return null;
     }
+
+    public Object identityConstraint(XSIdentityConstraint ic) {
+        return null;
+    }
+
+    public Object xpath(XSXPath xp) {
+        return null;
+    }
 }

--- NEW FILE: sun-jaxb-1.0.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define section free

Name:           sun-jaxb-1.0
Summary:        JAXB 1.0 API and Implementation
Url:            https://jaxb.dev.java.net/
Version:        1.0.6
Release:        2jpp
Epoch:          0
License:        CDDL
Group:          Development/Libraries/Java
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
BuildArch:      noarch
Source0:        jaxb-1.0.6.tar.gz
# cvs -d:pserver:guest at cvs.dev.java.net:/cvs export -r jaxb-1_0_6 -d jaxb-1.0.6 jaxb-sources

Source1:        sun-jaxb-1.0-api-build.xml
Source2:        xsom-20050414.tar.gz
# cvs -d:pserver:guest at cvs.dev.java.net:/cvs export -r scd -d xsom-20050415 jaxb2-sources/xsom

Source3:        jaxb-api-1.0.6.pom
Source4:        jaxb-impl-1.0.6.pom
Source5:        jaxb-libs-1.0.6.pom
Source6:        jaxb-xjc-1.0.6.pom


Patch0:         sun-jaxb-1.0-xjc-Options.patch
Patch1:         sun-jaxb-1.0-xjc-WhitespaceTransducer.patch
Patch2:         sun-jaxb-1.0-xjc-ConversionFinder.patch
Patch3:         sun-jaxb-1.0-xjc-ModelGroupBindingClassBinder.patch
Patch4:         sun-jaxb-1.0-xjc-DOMBinder.patch
Patch5:         sun-jaxb-1.0-xjc-DefaultClassBinder.patch
Patch6:         sun-jaxb-1.0-xjc-UnusedCustomizationChecker.patch
Patch7:         sun-jaxb-1.0-xjc-SimpleTypeBuilder.patch
Patch8:         sun-jaxb-1.0-xjc-FieldBuilder.patch
Patch9:         sun-jaxb-1.0-xjc-AGMFragmentBuilder.patch
Patch10:        sun-jaxb-1.0-xjc-TypeBuilder.patch
Patch11:        sun-jaxb-1.0-xjc-BIProperty.patch
Patch12:        sun-jaxb-1.0-build.patch
Patch13:        sun-jaxb-1.0-runtime-build.patch

BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-trax
BuildRequires:  args4j10
BuildRequires:  dom4j
BuildRequires:  isorelax
BuildRequires:  jing
BuildRequires:  msv-msv
BuildRequires:  msv-xsdlib
BuildRequires:  nekohtml
BuildRequires:  relaxngcc
BuildRequires:  relaxngDatatype
BuildRequires:  servlet_2_3_api
BuildRequires:  xalan-j2
BuildRequires:  xml-commons-jaxp-1.3-apis
BuildRequires:  xml-commons-resolver11

BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot

%description
JAXB 1.0 API and Implementation

%package api
Summary:        JAXB 1.0 API from %{name}
Group:          Development/Libraries/Java
Requires:       java >= 0:1.5.0
Requires(post):   jpackage-utils >= 0:1.7.4
Requires(postun): jpackage-utils >= 0:1.7.4
Provides:       jaxb_api = 0:1.0
Provides:       jaxb_1_0_api = 0:%{version}-%{release}

%description api
%{summary}.

%package impl
Summary:        JAXB 1.0 RI from %{name}
Group:          Development/Libraries/Java
Requires:       java >= 0:1.5.0
Requires:       %{name}-api = %{epoch}:%{version}-%{release}
Requires:       dom4j
Requires:       relaxngDatatype
Requires:       xsdlib

%description impl
%{summary}.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post):   /bin/rm,/bin/ln
Requires(postun): /bin/rm

%description javadoc
%{summary}.

%prep
##%setup -q -n jaxb-ri-%{version}
%setup -q -n jaxb-%{version}
gzip -dc %{SOURCE2} | tar xf -
chmod -R go=u-w *
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3
%patch4 -b .sav4
%patch5 -b .sav5
%patch6 -b .sav6
%patch7 -b .sav7
%patch8 -b .sav8
%patch9 -b .sav9
%patch10 -b .sav10
%patch11 -b .sav11
%patch12 -b .sav12
%patch13 -b .sav13


mkdir -p jaxb-api/src
pushd jaxb-api/src
unzip -qq ../../jaxb-ri/tools/lib/redist/jaxb-api-src.zip
popd
cp %{SOURCE1} jaxb-api/build.xml
mkdir -p jaxb-api/lib
ln -sf $(build-classpath dom4j) jaxb-api/lib

ln -sf $(build-classpath args4j10) jaxb-ri/tools/lib/args4j10.jar
ln -sf $(build-classpath isorelax) jaxb-ri/tools/lib/rebundle/isorelax.jar
ln -sf $(build-classpath msv-msv) jaxb-ri/tools/lib/rebundle/msv.jar
ln -sf $(build-classpath relaxngDatatype) jaxb-ri/tools/lib/redist/relaxngDatatype.jar
ln -sf $(build-classpath dom4j) jaxb-ri/tools/lib/util/dom4j.jar
ln -sf $(build-classpath servlet_2_3_api) jaxb-ri/tools/lib/util/servlet.jar
ln -sf $(build-classpath jing) jaxb-ri/tools/lib/util/jing.jar
ln -sf $(build-classpath nekohtml) jaxb-ri/tools/lib/util/nekohtml.jar
ln -sf $(build-classpath xsdlib) jaxb-ri/tools/lib/redist/xsdlib.jar
ln -sf $(build-classpath xml-commons-resolver11) jaxb-ri/tools/lib/rebundle/resolver.jar
#
ln -sf $(build-classpath relaxngcc) xsom-20050414/lib/relaxngcc.jar


%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0

export CLASSPATH=
pushd jaxb-api
ant -Dbuild-classpath=first jar
popd
cp jaxb-api/jaxb-api.jar jaxb-ri/tools/lib/redist/jaxb-api.jar
export CLASSPATH=$(build-classpath relaxngDatatype)
pushd xsom-20050414
ant -Dbuild-classpath=first 
popd
cp xsom-20050414/build/xsom.jar jaxb-ri/tools/lib/rebundle/xsom.jar
pushd jaxb-ri/tools/lib/src/
  mkdir -p javadt/src
  pushd javadt
    pushd src
      unzip ../../relaxng.javadt.src.zip
    popd
    mkdir classes
    export CLASSPATH=$(build-classpath relaxngDatatype)
    $JAVA_HOME/bin/javac -d classes $(find src -name "*.java")
    $JAVA_HOME/bin/jar -cf relaxng-javadt.jar -C classes com
  popd
popd
cp jaxb-ri/tools/lib/src/javadt/relaxng-javadt.jar jaxb-ri/tools/lib/rebundle/relaxng.javadt.jar
export CLASSPATH=$(build-classpath xalan-j2-serializer relaxngcc)
pushd jaxb-ri
ant -Dxjc.docs=doc/api -Dbuild.sysclasspath=first dist javadoc
popd

%install
rm -rf $RPM_BUILD_ROOT

# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 jaxb-ri/dist/lib/jaxb-api.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
install -m 644 jaxb-ri/dist/lib/jaxb-impl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/impl-%{version}.jar
install -m 644 jaxb-ri/dist/lib/jaxb-libs.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/libs-%{version}.jar
install -m 644 jaxb-ri/dist/lib/jaxb-xjc.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xjc-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
touch $RPM_BUILD_ROOT%{_javadir}/jaxb_1_0_api.jar
touch $RPM_BUILD_ROOT%{_javadir}/jaxb_api.jar


install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-sun-jaxb-1.0-api.pom
%add_to_maven_depmap javax.xml.bind jaxb-api 1.0 JPP %{name}-api
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.sun-jaxb-1.0-impl.pom
%add_to_maven_depmap com.sun.xml jaxb-impl %{version} JPP/%{name} impl
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.sun-jaxb-1.0-libs.pom
%add_to_maven_depmap com.sun.xml jaxb-libs %{version} JPP/%{name} libs
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.sun-jaxb-1.0-xjc.pom
%add_to_maven_depmap com.sun.xml jaxb-xjc %{version} JPP/%{name} xjc

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/codemodel
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/impl
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/xjc
cp -pr jaxb-ri/dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
cp -pr jaxb-ri/docs/api/codemodel/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/codemodel
cp -pr jaxb-ri/runtime/doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/impl
cp -pr jaxb-ri/xjc/doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/impl
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
    rm -f %{_javadocdir}/%{name}
fi

%post api
%update_maven_depmap
/usr/sbin/update-alternatives --install %{_javadir}/jaxb_1_0_api.jar jaxb_1_0_api %{_javadir}/%{name}-api.jar 10000
/usr/sbin/update-alternatives --install %{_javadir}/jaxb_api.jar jaxb_api %{_javadir}/%{name}-api.jar 10000

%postun api
%update_maven_depmap

%preun api
if [ "$1" = "0" ]; then
    /usr/sbin/update-alternatives --remove jaxb_1_0_api %{_javadir}/%{name}-api.jar
    /usr/sbin/update-alternatives --remove jaxb_api %{_javadir}/%{name}-api.jar
fi

%files api
%defattr(-,root,root)
%{_javadir}/%{name}*.jar
%ghost %{_javadir}/jaxb_api.jar
%ghost %{_javadir}/jaxb_1_0_api.jar
%{_datadir}/maven2
%{_mavendepmapfragdir}

%files impl
%defattr(-,root,root)
%{_javadir}/%{name}

%files javadoc
%defattr(-,root,root)
%{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%changelog
* Tue Mar 11 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0.6-2jpp
- Touch, don't link the ghosts

* Mon Mar 10 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0.6-1jpp
- First release

--- NEW FILE: sun-jaxb-1.0-api-build.xml ---
<?xml version="1.0"?>

<!--
 The contents of this file are subject to the terms
 of the Common Development and Distribution License
 (the "License").  You may not use this file except
 in compliance with the License.
 
 You can obtain a copy of the license at
 https://jwsdp.dev.java.net/CDDLv1.0.html
 See the License for the specific language governing
 permissions and limitations under the License.
 
 When distributing Covered Code, include this CDDL
 HEADER in each file and include the License file at
 https://jwsdp.dev.java.net/CDDLv1.0.html  If applicable,
 add the following below this CDDL HEADER, with the
 fields enclosed by brackets "[]" replaced with your
 own identifying information: Portions Copyright [yyyy]
 [name of copyright owner]
-->

<!--
  build script for the source code bundle.
-->
<project name="test" default="build">
  <target name="build">
    <!-- check if dom4j.jar is there -->
    <available file="lib/dom4j.jar" property="dom4j.available"/>
    <fail unless="dom4j.available">download dom4j.jar from http://www.dom4j.org/ and place it to the lib directory</fail>
    
    <!-- compile -->
    <mkdir dir="build"/>
    <javac srcdir="src" destdir="build" includes="javax/**">
      <classpath>
        <fileset dir="lib" includes="**/*.jar"/>
      </classpath>
    </javac>
  </target>
  <target name="jar" depends="build">
    <jar jarfile="jaxb-api.jar">
      <fileset dir="build">
        <include name="javax/xml/bind/**/*.class"/>
      </fileset>
    </jar>
  </target>

</project>

--- NEW FILE: sun-jaxb-1.0-xjc-Options.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/Options.java.sav0	2005-09-10 20:20:00.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/Options.java	2008-03-09 18:59:57.000000000 +0100
@@ -278,7 +278,8 @@
             debugMode = true;
             // try to set the verbose flag of catalog resolver
             try {
-                Debug.setDebug(10);
+                Debug debug=CatalogManager.getStaticManager().debug;
+                debug.setDebug(10);
             } catch(Throwable _) {
                 ;   // ignore, in case catalog resolver isn't in the classpath
             }
@@ -425,7 +426,7 @@
      */
     public void addCatalog(File catalogFile) throws IOException {
         if(entityResolver==null) {
-            CatalogManager.ignoreMissingProperties(true);
+            CatalogManager.getStaticManager().ignoreMissingProperties(true);
             entityResolver = new CatalogResolver(true);
         }
         ((CatalogResolver)entityResolver).getCatalog().parseCatalog(catalogFile.getPath());

--- NEW FILE: sun-jaxb-1.0-xjc-WhitespaceTransducer.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/grammar/xducer/WhitespaceTransducer.java.sav1	2005-09-10 20:20:23.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/grammar/xducer/WhitespaceTransducer.java	2008-03-09 19:01:54.000000000 +0100
@@ -67,7 +67,7 @@
         if(f==null)     // this happens for anySimpleType
             return _core;   // preserve
         else
-            return create(_core,_codeModel,WhitespaceNormalizer.parse(f.getValue()));
+            return create(_core,_codeModel,WhitespaceNormalizer.parse(f.getValue().toString()));
     }
 
     

--- NEW FILE: sun-jaxb-1.0-runtime-build.patch ---
--- jaxb-ri/runtime/build.xml.sav13	2005-09-10 20:18:35.000000000 +0200
+++ jaxb-ri/runtime/build.xml	2008-03-10 13:25:27.000000000 +0100
@@ -95,9 +95,10 @@
 
     <!-- generate javadoc -->
     <!-- not sure if we need this for runtime
+    -->
     <target name="javadoc" depends="compile">
         <mkdir dir="./doc/api" />
-        <javadoc packagenames="" 
+        <javadoc packagenames="com.sun.xml.bind.*" 
             sourcepath="./src"
             classpath="./build/classes"
             destdir="./doc/api"
@@ -107,7 +108,6 @@
             windowtitle=""
             doctitle="" />
     </target>
-    -->
 
     <!-- remove all intermediate files -->
     <target name="clean-runtime">

--- NEW FILE: sun-jaxb-1.0-xjc-ConversionFinder.patch ---
--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/ConversionFinder.java.sav2	2005-09-10 20:20:33.000000000 +0200
+++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/ConversionFinder.java	2008-03-09 19:03:52.000000000 +0100
@@ -378,13 +378,13 @@
             if(!facet.getName().equals(XSFacet.FACET_ENUMERATION))
                 continue;
             
-            String value = facet.getValue();
+            String value = facet.getValue().toString();
             
             if( members.containsKey(value) )
                 continue;   // this name is overrided.
                 
             if( !JJavaName.isJavaIdentifier(
-                    builder.getNameConverter().toConstantName(facet.getValue()) )) {
+                    builder.getNameConverter().toConstantName(facet.getValue().toString()) )) {
                 // this enum value isn't overrided by the customization
                 // and it will not produce a correct Java identifier.
                 //

--- NEW FILE: jaxb-xjc-1.0.6.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.sun.xml</groupId>
  <artifactId>jaxb-xjc</artifactId>
  <version>1.0.6</version>
  <name>JAXB XML Binding Code Generator Package</name>
  <description>
    Part of the Java Web Services Developer Pack 1.6
  </description>
  <url>http://java.sun.com/xml/jaxb/index.jsp</url>
  <distributionManagement>
    <downloadUrl>http://java.sun.com/webservices/downloads/webservicespack.html</downloadUrl>
  </distributionManagement>

  <dependencies>
    <dependency>
      <groupId>com.sun.xml</groupId>
      <artifactId>jaxb-impl</artifactId>
      <version>1.0.6</version>
    </dependency>
    <dependency>
      <groupId>com.sun.xml</groupId>
      <artifactId>jaxb-libs</artifactId>
      <version>1.0.6</version>
    </dependency>
    <dependency>
      <groupId>javax.xml</groupId>
      <artifactId>namespace</artifactId>
      <version>1.0.1</version>
    </dependency>
    <dependency>
      <groupId>javax.xml</groupId>
      <artifactId>jax-qname</artifactId>
      <version>1.1</version>
    </dependency>
    <dependency>
      <groupId>com.sun.xml</groupId>
      <artifactId>xsdlib</artifactId>
      <version>20050614</version>
    </dependency>
  </dependencies>

</project> 




More information about the JPackage-commits mailing list