You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2012/06/26 13:37:28 UTC
svn commit: r1353964 - in /santuario/xml-security-java/trunk: ./
src/main/resources/bindings/ src/main/resources/bindings/c14n/
src/main/resources/bindings/c14n/schemas/
src/main/resources/bindings/schemas/ src/main/resources/bindings/xmldsig/
src/main...
Author: coheigea
Date: Tue Jun 26 11:37:26 2012
New Revision: 1353964
URL: http://svn.apache.org/viewvc?rev=1353964&view=rev
Log:
Some refactoring of the new bindings
Added:
santuario/xml-security-java/trunk/src/main/resources/bindings/bindings.cat
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/c14n.cat
santuario/xml-security-java/trunk/src/main/resources/bindings/c14n.xjb
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/c14n.xjb
santuario/xml-security-java/trunk/src/main/resources/bindings/dsig.xjb
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig/dsig.xjb
santuario/xml-security-java/trunk/src/main/resources/bindings/dsig11.xjb
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/dsig11.xjb
santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/
santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/XMLSchema.dtd
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/XMLSchema.dtd
santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/datatypes.dtd
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/datatypes.dtd
santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/exc-c14n.xsd
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/exc-c14n.xsd
santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xenc-schema.xsd
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/schemas/xenc-schema.xsd
santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xml.xsd
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/xml.xsd
santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xmldsig-core-schema.xsd
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig/schemas/xmldsig-core-schema.xsd
santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xmldsig11-schema.xsd
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/schemas/xmldsig11-schema.xsd
santuario/xml-security-java/trunk/src/main/resources/bindings/xenc.xjb
- copied, changed from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/xenc.xjb
Removed:
santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/c14n.cat
santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/c14n.xjb
santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/XMLSchema.dtd
santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/datatypes.dtd
santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/exc-c14n.xsd
santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/xml.xsd
santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig/dsig.xjb
santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig/schemas/XMLSchema.dtd
santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig/schemas/datatypes.dtd
santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig/schemas/xmldsig-core-schema.xsd
santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig/xmldsig.cat
santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/dsig11.xjb
santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/schemas/XMLSchema.dtd
santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/schemas/datatypes.dtd
santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/schemas/xmldsig1-schema.xsd
santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/schemas/xmldsig11-schema.xsd
santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/xmldsig11.cat
santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/schemas/XMLSchema.dtd
santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/schemas/datatypes.dtd
santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/schemas/xenc-schema.xsd
santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/xenc.xjb
santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/xmlenc.cat
Modified:
santuario/xml-security-java/trunk/pom.xml
Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1353964&r1=1353963&r2=1353964&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Tue Jun 26 11:37:26 2012
@@ -81,6 +81,12 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
</resources>
<testResources>
<testResource>
@@ -188,6 +194,48 @@
</instructions>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <version>0.8.0</version>
+ <executions>
+ <execution>
+ <id>bindings</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <schemaDirectory>
+ ${basedir}/src/main/resources/bindings/schemas
+ </schemaDirectory>
+ <schemaIncludes>
+ <schemaInclude>exc-c14n.xsd</schemaInclude>
+ <schemaInclude>xmldsig-core-schema.xsd</schemaInclude>
+ <schemaInclude>xmldsig11-schema.xsd</schemaInclude>
+ <schemaInclude>xenc-schema.xsd</schemaInclude>
+ </schemaIncludes>
+ <bindingDirectory>${basedir}/src/main/resources/bindings/</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>c14n.xjb</bindingInclude>
+ <bindingInclude>dsig.xjb</bindingInclude>
+ <bindingInclude>dsig11.xjb</bindingInclude>
+ <bindingInclude>xenc.xjb</bindingInclude>
+ </bindingIncludes>
+ <catalog>${basedir}/src/main/resources/bindings/bindings.cat</catalog>
+ <forceRegenerate>false</forceRegenerate>
+ <episode>true</episode>
+ <specVersion>2.1</specVersion>
+ <extension>true</extension>
+ <!-- disable schema validation since the validation code
+ doesn't respect the catalog and will do online lookups :-( -->
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
<pluginManagement>
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/bindings.cat (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/c14n.cat)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/bindings.cat?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/bindings.cat&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/c14n.cat&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
(empty)
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/c14n.xjb (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/c14n.xjb)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/c14n.xjb?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/c14n.xjb&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/c14n.xjb&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
(empty)
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/dsig.xjb (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig/dsig.xjb)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/dsig.xjb?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/dsig.xjb&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig/dsig.xjb&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
(empty)
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/dsig11.xjb (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/dsig11.xjb)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/dsig11.xjb?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/dsig11.xjb&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/dsig11.xjb&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
(empty)
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/XMLSchema.dtd (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/XMLSchema.dtd)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/XMLSchema.dtd?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/XMLSchema.dtd&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/XMLSchema.dtd&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
(empty)
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/datatypes.dtd (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/datatypes.dtd)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/datatypes.dtd?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/datatypes.dtd&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/datatypes.dtd&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
(empty)
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/exc-c14n.xsd (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/exc-c14n.xsd)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/exc-c14n.xsd?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/exc-c14n.xsd&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/exc-c14n.xsd&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
(empty)
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xenc-schema.xsd (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/schemas/xenc-schema.xsd)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xenc-schema.xsd?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xenc-schema.xsd&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/schemas/xenc-schema.xsd&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/schemas/xenc-schema.xsd (original)
+++ santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xenc-schema.xsd Tue Jun 26 11:37:26 2012
@@ -16,9 +16,6 @@
targetNamespace='http://www.w3.org/2001/04/xmlenc#'
elementFormDefault='qualified'>
- <import namespace='http://www.w3.org/2000/09/xmldsig#'
- schemaLocation='http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd'/>
-
<complexType name='EncryptedType' abstract='true'>
<sequence>
<element name='EncryptionMethod' type='xenc:EncryptionMethodType'
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xml.xsd (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/xml.xsd)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xml.xsd?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xml.xsd&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/c14n/schemas/xml.xsd&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
(empty)
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xmldsig-core-schema.xsd (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig/schemas/xmldsig-core-schema.xsd)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xmldsig-core-schema.xsd?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xmldsig-core-schema.xsd&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig/schemas/xmldsig-core-schema.xsd&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
(empty)
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xmldsig11-schema.xsd (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/schemas/xmldsig11-schema.xsd)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xmldsig11-schema.xsd?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xmldsig11-schema.xsd&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/schemas/xmldsig11-schema.xsd&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/resources/bindings/xmldsig11/schemas/xmldsig11-schema.xsd (original)
+++ santuario/xml-security-java/trunk/src/main/resources/bindings/schemas/xmldsig11-schema.xsd Tue Jun 26 11:37:26 2012
@@ -5,9 +5,6 @@
targetNamespace="http://www.w3.org/2009/xmldsig11#"
version="0.1" elementFormDefault="qualified">
- <import namespace="http://www.w3.org/2000/09/xmldsig#"
- schemaLocation='http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd'/>
-
<element name="ECKeyValue" type="dsig11:ECKeyValueType"/>
<complexType name="ECKeyValueType">
<sequence>
Copied: santuario/xml-security-java/trunk/src/main/resources/bindings/xenc.xjb (from r1353947, santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/xenc.xjb)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/xenc.xjb?p2=santuario/xml-security-java/trunk/src/main/resources/bindings/xenc.xjb&p1=santuario/xml-security-java/trunk/src/main/resources/bindings/xmlenc/xenc.xjb&r1=1353947&r2=1353964&rev=1353964&view=diff
==============================================================================
(empty)