summaryrefslogtreecommitdiffstats
path: root/branches/java-M1/java/spec
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:11:40 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:11:40 +0000
commit76e9f96ca7f494088fe3af5a46ad0d153e961008 (patch)
treee44436205dcb28d3d8c6352fa7b36a90f59db2a1 /branches/java-M1/java/spec
parentf9be2165328dc76f562938566057e89c0723fe08 (diff)
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835139 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/java-M1/java/spec')
-rw-r--r--branches/java-M1/java/spec/pom.xml263
-rw-r--r--branches/java-M1/java/spec/sca/pom.xml36
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/CurrentModuleContext.java42
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ModuleContext.java102
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java66
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/RequestContext.java47
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/SCA.java49
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceReference.java67
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceRuntimeException.java67
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceUnavailableException.java64
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/SessionEndedException.java66
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/Version.java43
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java36
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Callback.java42
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/ComponentMetaData.java33
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/ComponentName.java33
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Context.java34
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Destroy.java33
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Init.java39
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/OneWay.java34
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Property.java43
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Reference.java43
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Remotable.java34
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Scope.java42
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Service.java41
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Session.java49
-rw-r--r--branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/SessionID.java33
-rw-r--r--branches/java-M1/java/spec/sca/src/main/resources/META-INF/LICENSE.txt1277
-rw-r--r--branches/java-M1/java/spec/sca/src/main/resources/META-INF/MANIFEST.MF16
-rw-r--r--branches/java-M1/java/spec/sca/src/main/resources/META-INF/NOTICE18
-rw-r--r--branches/java-M1/java/spec/sca/src/main/resources/META-INF/README.txt35
-rw-r--r--branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-binding-sca.xsd35
-rw-r--r--branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-binding-webservice.xsd36
-rw-r--r--branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-core.xsd230
-rw-r--r--branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-implementation-java.xsd36
-rw-r--r--branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-interface-java.xsd37
-rw-r--r--branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-interface-wsdl.xsd37
-rw-r--r--branches/java-M1/java/spec/sca/src/main/resources/schemas/sca.xsd31
-rw-r--r--branches/java-M1/java/spec/sca/src/test/java/org/osoa/sca/annotations/CallbackTestCase.java68
-rw-r--r--branches/java-M1/java/spec/sca/src/test/java/org/osoa/sca/annotations/usage/CallbackType.java47
-rw-r--r--branches/java-M1/java/spec/sdo/pom.xml51
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/ChangeSummary.java204
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/DataGraph.java73
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/DataObject.java1105
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Property.java79
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Sequence.java131
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Type.java143
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/CopyHelper.java82
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/DataFactory.java61
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/DataHelper.java184
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/EqualityHelper.java89
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/TypeHelper.java70
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XMLDocument.java152
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XMLHelper.java167
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XSDHelper.java193
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java87
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/HelperProvider.java364
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/NoHelperProviderException.java55
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/resources/META-INF/LICENSE.txt1277
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/resources/META-INF/MANIFEST.MF16
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/resources/META-INF/NOTICE18
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/resources/META-INF/README.txt35
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/resources/xml/datagraph.xsd77
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoJava.xml45
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoJava.xsd85
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoModel.xml87
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoModel.xsd217
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoXML.xml32
-rw-r--r--branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoXML.xsd49
-rw-r--r--branches/java-M1/java/spec/sdo/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java90
-rw-r--r--branches/java-M1/java/spec/sdo/src/test/java/test/DefaultHelperProvider.java68
-rw-r--r--branches/java-M1/java/spec/sdo/src/test/java/test/TCCL1HelperProvider.java68
-rw-r--r--branches/java-M1/java/spec/sdo/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider3
-rw-r--r--branches/java-M1/java/spec/sdo/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider1
74 files changed, 0 insertions, 8842 deletions
diff --git a/branches/java-M1/java/spec/pom.xml b/branches/java-M1/java/spec/pom.xml
deleted file mode 100644
index d1e2972a87..0000000000
--- a/branches/java-M1/java/spec/pom.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<project>
- <!-- to keep separation between project and spec we do not extend the Tuscany project POM -->
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.osoa</groupId>
- <artifactId>spec</artifactId>
- <packaging>pom</packaging>
- <name>OSOA Specification API jars</name>
- <url>http://incubator.apache.org/tuscany/</url>
- <version>incubating-M1</version>
-
- <prerequisites>
- <maven>2.0</maven>
- </prerequisites>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <repositories>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio</name>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <!--
- <snapshotRepository>
- <id>maven-snapshot-repository</id>
- <name>Apache SNAPSHOT Repository</name>
- <url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
- </snapshotRepository>
- -->
- <repository>
- <id>maven-test-repository</id>
- <name>Test Repository</name>
- <url>scp://people.apache.org/home/jsdelfino/public_html/maven2</url>
- </repository>
- </distributionManagement>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/tuscany/java/spec</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/tuscany/java/spec</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/incubator/tuscany/java/spec</url>
- </scm>
-
- <modules>
- <module>sdo</module>
- <module>sca</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- <manifestEntries>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-URL>http://incubator.apache.org/tuscany/</Implementation-URL>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- <defaultGoal>install</defaultGoal>
-
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-alpha-5</version>
- </extension>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ftp</artifactId>
- <version>1.0-alpha-6</version>
- </extension>
-
- </extensions>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>distribution</id>
-
- <activation>
- <property>
- <name>tuscany.home</name>
- </property>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- <offlineLinks>
- <offlineLink>
- <url>../sca-api</url>
- <location>${tuscany.home}/spec/sca/target/site/apidocs</location>
- </offlineLink>
- <offlineLink>
- <url>../sdo-api</url>
- <location>${tuscany.home}/spec/sdo/target/site/apidocs</location>
- </offlineLink>
- <offlineLink>
- <url>../tuscany-common</url>
- <location>${tuscany.home}/sca/common/target/site/apidocs</location>
- </offlineLink>
- <offlineLink>
- <url>../tuscany-model</url>
- <location>${tuscany.home}/sca/model/target/site/apidocs</location>
- </offlineLink>
- <offlineLink>
- <url>../tuscany-core</url>
- <location>${tuscany.home}/sca/core/target/site/apidocs</location>
- </offlineLink>
- <offlineLink>
- <url>../tuscany-databinding-sdo</url>
- <location>${tuscany.home}/sca/databinding/sdo/target/site/apidocs</location>
- </offlineLink>
- </offlineLinks>
- <!--
- <outputDirectory>${tuscany.home}/distribution/build/javadoc/${project.artifactId}</outputDirectory>
- -->
- <attach>true</attach>
- <quiet>true</quiet>
- <bottom>-</bottom>
- <header>${project.name}</header>
- <footer>${project.name}</footer>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>create-dist</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <ant inheritRefs="true"
- antfile="${tuscany.home}/distribution/buildDistribution.xml" dir="${tuscany.home}"
- target="createDistribution">
- <property name="dist.folder"
- value="${tuscany.home}/distribution/build" />
- <property
- name="project.packaging" value="${project.packaging}" />
- <property
- name="project.groupId" value="${project.groupId}" />
- <property
- name="project.artifactId" value="${project.artifactId}" />
- <property
- name="project.version" value="${project.version}" />
- <property
- name="project.basedir" value="${basedir}" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>clean-dist</id>
- <phase>clean</phase>
- <configuration>
- <tasks>
- <ant inheritRefs="true"
- antfile="${tuscany.home}/distribution/buildDistribution.xml" dir="${tuscany.home}"
- target="cleanDistribution">
- <property name="dist.folder"
- value="${tuscany.home}/distribution/build" />
- <property
- name="project.packaging" value="${project.packaging}" />
- <property
- name="project.groupId" value="${project.groupId}" />
- <property
- name="project.artifactId" value="${project.artifactId}" />
- <property
- name="project.version" value="${project.version}" />
- <property
- name="project.basedir" value="${basedir}" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/branches/java-M1/java/spec/sca/pom.xml b/branches/java-M1/java/spec/sca/pom.xml
deleted file mode 100644
index 3f1575d05d..0000000000
--- a/branches/java-M1/java/spec/sca/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<project>
- <parent>
- <groupId>org.osoa</groupId>
- <artifactId>spec</artifactId>
- <version>incubating-M1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>sca-api</artifactId>
- <name>SCA API</name>
- <version>incubating-M1</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/CurrentModuleContext.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/CurrentModuleContext.java
deleted file mode 100644
index 90cc2ff79c..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/CurrentModuleContext.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca;
-
-/**
- * Class providing access to the current ModuleContext.
- * <p/>
- * The current context is set by the SCA container implementation before dispatching
- * a request to any component in the module.
- *
- * @version $Rev$ $Date$
- */
-public final class CurrentModuleContext {
- private static final ThreadLocal<ModuleContext> CURRENT_CONTEXT = new InheritableThreadLocal<ModuleContext>();
-
- /**
- * Return the current ModuleContext.
- *
- * @return the current ModuleContext
- */
- public static ModuleContext getContext() {
- return CURRENT_CONTEXT.get();
- }
-
- static void setContext(ModuleContext ctx) {
- CURRENT_CONTEXT.set(ctx);
- }
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ModuleContext.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ModuleContext.java
deleted file mode 100644
index 77a36a2f77..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ModuleContext.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca;
-
-
-/**
- * Interface that can be used by SCA Components to access information about the
- * Module that contains them.
- *
- * @version $Rev$ $Date$
- */
-public interface ModuleContext {
-
- /**
- * Returns the name of the module.
- *
- * @return the name of the module
- */
- String getName();
-
- /**
- * Returns the absolute URI of the module component.
- *
- * @return the absolute URI of the module component
- */
- String getURI();
-
-//FIXME This is not implemented yet, we need the SCA spec to define the metadata model first.
-// /**
-// * Returns the Module metadata object.
-// * This represents the root &lt;module&gt; element in the SCA module definition.
-// *
-// * @return the module metadata object
-// */
-// Module getMetaData();
-
- /**
- * Returns the request context that corresponds to the last remotable service invocation.
- * If this is invoked from outside an SCA component then <tt>null</tt> is returned.
- *
- * @return the current request context
- */
- RequestContext getRequestContext();
-
- /**
- * Returns an object implementing the interface defined for the named service.
- *
- * @param serviceName the name of another service in the current module
- * @return an object that implements the service's interface
- */
- Object locateService(String serviceName);
-
- /**
- * Create a reference to the supplied component.
- * The component must define only one service.
- *
- * @param self the component to be referenced
- * @return a reference to the component
- */
- ServiceReference createServiceReferenceForSession(Object self);
-
- /**
- * Create a reference to the named service implemented by the supplied component.
- *
- * @param self the component to be referenced
- * @param serviceName the service to be referenced
- * @return a reference to the service
- */
- ServiceReference createServiceReferenceForSession(Object self, String serviceName);
-
- /**
- * Create a new session for stateful interaction with the named service.
- *
- * @param serviceName the name of the service to interact with
- * @return a reference to the service
- */
- ServiceReference newSession(String serviceName);
-
- /**
- * Create a new session for stateful interaction with the named service
- * using an application-supplied session identifier.
- *
- * @param serviceName the name of the service to interact with
- * @param sessionId a token that identifies this session
- * @return a reference to the service
- */
- ServiceReference newSession(String serviceName, Object sessionId);
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
deleted file mode 100644
index 2c230c6729..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca;
-
-/**
- * Exception thrown to indicate that no callback has been registered
- * when interacting with a service.
- *
- * @version $Rev$ $Date$
- */
-public class NoRegisteredCallbackException extends ServiceRuntimeException {
- private static final long serialVersionUID = 3734864942222558406L;
-
- /**
- * Override constructor from ServiceRuntimeException.
- *
- * @see ServiceRuntimeException
- */
- public NoRegisteredCallbackException() {
- }
-
- /**
- * Override constructor from ServiceRuntimeException.
- *
- * @param message passed to ServiceRuntimeException
- * @see ServiceRuntimeException
- */
- public NoRegisteredCallbackException(String message) {
- super(message);
- }
-
- /**
- * Override constructor from ServiceRuntimeException.
- *
- * @param message passed to ServiceRuntimeException
- * @param cause passed to ServiceRuntimeException
- * @see ServiceRuntimeException
- */
- public NoRegisteredCallbackException(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * Override constructor from ServiceRuntimeException.
- *
- * @param cause passed to ServiceRuntimeException
- * @see ServiceRuntimeException
- */
- public NoRegisteredCallbackException(Throwable cause) {
- super(cause);
- }
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/RequestContext.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/RequestContext.java
deleted file mode 100644
index e5f3ee63b1..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/RequestContext.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca;
-
-import javax.security.auth.Subject;
-
-/**
- * Interface that provides information on the current request.
- *
- * @version $Rev$ $Date$
- */
-public interface RequestContext {
- /**
- * Returns the JAAS Subject of the current request.
- *
- * @return the Subject of the current request
- */
- Subject getSecuritySubject();
-
- /**
- * Returns the name of the service that was invoked.
- *
- * @return the name of the service that was invoked
- */
- String getServiceName();
-
- /**
- * Returns a reference to the service that was invoked.
- *
- * @return a reference to the service that was invoked
- */
- ServiceReference getServiceReference();
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/SCA.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/SCA.java
deleted file mode 100644
index e74a3def11..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/SCA.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca;
-
-/**
- * Class providing access to an SCA implementation.
- * SCA implementation providers may allow applications to bootstrap an SCA environment
- * by providing a publically available subclass.
- *
- * @version $Rev$ $Date$
- */
-public abstract class SCA {
- /**
- * Protected method that allows an SCA implementation to set the current module context
- * that will be returned by {@link org.osoa.sca.CurrentModuleContext#getContext()}.
- *
- * @param ctx the new current module context
- */
- protected static void setModuleContext(ModuleContext ctx) {
- CurrentModuleContext.setContext(ctx);
- }
-
- /**
- * Start the SCA implementation.
- * If this method completes successfully then a module context will be associated with the current thread.
- */
- public abstract void start();
-
- /**
- * Stop the SCA implementation.
- * Once this method completes (successfully or abnormally) then no module context will be associated
- * with the current thread.
- */
- public abstract void stop();
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceReference.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceReference.java
deleted file mode 100644
index 137d682736..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceReference.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca;
-
-
-/**
- * Interface that provides access to other services.
- * Any ServiceReference can be cast to the business interface of the service to
- * which it refers.
- *
- * @version $Rev$ $Date$
- */
-public interface ServiceReference {
- /**
- * Returns the session ID.
- *
- * @return the session ID
- */
- Object getSessionID();
-
- /**
- * End the client's session with the referenced service.
- */
- void endSession();
-
- /**
- * Returns the callback ID.
- *
- * @return the callback ID
- */
- Object getCallbackID();
-
- /**
- * Sets the callback ID.
- *
- * @param callbackID the callback ID
- */
- void setCallbackID(Object callbackID);
-
- /**
- * Returns the callback object.
- *
- * @return the callback object
- */
- Object getCallback();
-
- /**
- * Sets the callback object.
- *
- * @param callback the callback object
- */
- void setCallback(Object callback);
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceRuntimeException.java
deleted file mode 100644
index 6b5ee9ffd3..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca;
-
-
-/**
- * Base for Exceptions that may be raised by an SCA runtime and which typical
- * application code is not expected to be able to handle.
- *
- * @version $Rev$ $Date$
- */
-public class ServiceRuntimeException extends RuntimeException {
- private static final long serialVersionUID = -3876058842262557092L;
-
- /**
- * Override constructor from RuntimeException.
- *
- * @see RuntimeException
- */
- public ServiceRuntimeException() {
- }
-
- /**
- * Override constructor from RuntimeException.
- *
- * @param message passed to RuntimeException
- * @see RuntimeException
- */
- public ServiceRuntimeException(String message) {
- super(message);
- }
-
- /**
- * Override constructor from RuntimeException.
- *
- * @param message passed to RuntimeException
- * @param cause passed to RuntimeException
- * @see RuntimeException
- */
- public ServiceRuntimeException(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * Override constructor from RuntimeException.
- *
- * @param cause passed to RuntimeException
- * @see RuntimeException
- */
- public ServiceRuntimeException(Throwable cause) {
- super(cause);
- }
-} \ No newline at end of file
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceUnavailableException.java
deleted file mode 100644
index 8f51fc966c..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca;
-
-/**
- * Exception used to indicate that a runtime exception occurred during the invocation of and external service.
- *
- * @version $Rev$ $Date$
- */
-public class ServiceUnavailableException extends ServiceRuntimeException {
-
- private static final long serialVersionUID = -5869397223249401047L;
-
- /**
- * Constructs a new ServiceUnavailableException.
- */
- public ServiceUnavailableException() {
- super((Throwable) null);
- }
-
- /**
- * Constructs a new ServiceUnavailableException with the specified detail message.
- *
- * @param message The detail message (which is saved to later retrieval by the getMessage() method).
- */
- public ServiceUnavailableException(String message) {
- super(message);
- }
-
- /**
- * Constructs a new ServiceUnavailableException with the specified cause.
- *
- * @param cause The cause (which is saved to later retrieval by the getCause() method).
- */
- public ServiceUnavailableException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a new ServiceUnavailableException with the specified detail message and cause.
- * @param message
- * The message (which is saved to later retrieval by the getMessage() method).
- * @param cause
- * The cause (which is saved to later retrieval by the getCause() method).
- */
- public ServiceUnavailableException(String message, Throwable cause) {
- super(message, cause);
- }
-
-} \ No newline at end of file
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/SessionEndedException.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/SessionEndedException.java
deleted file mode 100644
index 44d8a78fca..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/SessionEndedException.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca;
-
-/**
- * Exception thrown to indicate the session being used for a stateful
- * interaction has been ended.
- *
- * @version $Rev$ $Date$
- */
-public class SessionEndedException extends ServiceRuntimeException {
- private static final long serialVersionUID = 3734864942222558406L;
-
- /**
- * Override constructor from ServiceRuntimeException.
- *
- * @see ServiceRuntimeException
- */
- public SessionEndedException() {
- }
-
- /**
- * Override constructor from ServiceRuntimeException.
- *
- * @param message passed to ServiceRuntimeException
- * @see ServiceRuntimeException
- */
- public SessionEndedException(String message) {
- super(message);
- }
-
- /**
- * Override constructor from ServiceRuntimeException.
- *
- * @param message passed to ServiceRuntimeException
- * @param cause passed to ServiceRuntimeException
- * @see ServiceRuntimeException
- */
- public SessionEndedException(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * Override constructor from ServiceRuntimeException.
- *
- * @param cause passed to ServiceRuntimeException
- * @see ServiceRuntimeException
- */
- public SessionEndedException(Throwable cause) {
- super(cause);
- }
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/Version.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/Version.java
deleted file mode 100644
index 6f3ab8fb4e..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/Version.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca;
-
-/**
- * Class providing information on the version of the specification
- * supported by these API classes.
- *
- * @version $Rev$ $Date$
- */
-public final class Version {
- /**
- * Identifier for version 0.9
- */
- public static final String VERSION_0_9 = "0.9";
-
- /**
- * Identifier for the XML Namespace for version 0.9
- */
- public static final String XML_NAMESPACE_0_9 = "http://www.osoa.org/xmlns/sca/0.9";
-
- /**
- * The specification version of these API classes.
- */
- public static final String API_VERSION = VERSION_0_9;
-
- private Version() {
- }
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
deleted file mode 100644
index 7a3d222aae..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation on a method that indicates that its parameters may safely
- * be passed by reference. The annotation may also be placed on an interface
- * or class to indicate that all declared methods support this optimization.
- *
- * @version $Rev$ $Date$
- */
-@Target({TYPE, METHOD})
-@Retention(RUNTIME)
-public @interface AllowsPassByReference {
-}
-
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Callback.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Callback.java
deleted file mode 100644
index 37e3adb9ff..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Callback.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * When placed on a service interface, this annotation specifies the interface
- * to be used for callbacks.
- * <p/>
- * When placed on a method or field, this annotation denotes the injection
- * site to be used for a callback reference.
- *
- * @version $Rev$ $Date$
- */
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Callback {
- /**
- * The Class of the callback interface.
- */
- Class<?> value() default Void.class;
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/ComponentMetaData.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/ComponentMetaData.java
deleted file mode 100644
index c35b023ea4..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/ComponentMetaData.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a field or method that is used to inject the component's metadata object.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface ComponentMetaData {
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/ComponentName.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/ComponentName.java
deleted file mode 100644
index 46a117ea04..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a field or method that is used to inject the component's name.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface ComponentName {
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Context.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Context.java
deleted file mode 100644
index 1139e97a96..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Context.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a field or method that is used to inject the component's ModuleContext.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Context {
-}
-
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Destroy.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Destroy.java
deleted file mode 100644
index c75e0fc165..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a method that will be called by the container when the
- * scope defined for the local service ends.
- *
- * @version $Rev$ $Date$
- */
-@Target(METHOD)
-@Retention(RUNTIME)
-public @interface Destroy {
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Init.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Init.java
deleted file mode 100644
index 94745a64d2..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Init.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a method that will be called by the container when the
- * scope defined for the local service begins.
- *
- * @version $Rev$ $Date$
- */
-@Target(METHOD)
-@Retention(RUNTIME)
-public @interface Init {
- /**
- * Instructs the container when a component instance should be instantiated.
- * If true, then the component will be instantiated when its scope begins;
- * if false it will be instantiated when first referenced.
- */
- public boolean eager() default false;
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/OneWay.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/OneWay.java
deleted file mode 100644
index 15cb69cdeb..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation on a method that indicates that the method is non-blocking and communication
- * with the service provider may use buffer the requests and send them at some later time.
- *
- * @version $Rev: 388784 $ $Date: 2006-03-25 08:34:51 -0800 (Sat, 25 Mar 2006) $
- */
-@Target({METHOD})
-@Retention(RUNTIME)
-public @interface OneWay {
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Property.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Property.java
deleted file mode 100644
index b9cee1765a..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Property.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a field or method that is used to inject a configuration property value.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Property {
- /**
- * The name of the property. If not specified then the name will be derived from the annotated field.
- */
- public String name() default "";
-
- /**
- * Indicates if a value must be specified.
- */
- public boolean required() default false;
-}
-
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Reference.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Reference.java
deleted file mode 100644
index f7f390da0d..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Reference.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a field or method that is used to inject a reference.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Reference {
- /**
- * The name of the reference. If not specified then the name will be derived from the annotated field.
- */
- public String name() default "";
-
- /**
- * Indicates if a reference must be specified.
- */
- public boolean required() default false;
-}
-
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Remotable.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Remotable.java
deleted file mode 100644
index 4048e240b6..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a Java interface as remotable.
- * Remotable interfaces use pass-by-value semantics, can be published as entry points
- * and used for external services.
- *
- * @version $Rev$ $Date$
- */
-@Target(TYPE)
-@Retention(RUNTIME)
-public @interface Remotable {
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Scope.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Scope.java
deleted file mode 100644
index 2e0f474687..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Scope.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a scoped service.
- *
- * @version $Rev$ $Date$
- */
-@Target(TYPE)
-@Retention(RUNTIME)
-public @interface Scope {
- /**
- * The name of the scope. Values currently defined by the specification are:
- * <ul>
- * <li>stateless (default)</li>
- * <li>request</li>
- * <li>session</li>
- * <li>module</li>
- * </ul>
- */
- String value() default "stateless";
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Service.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Service.java
deleted file mode 100644
index 3c51316c14..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Service.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate the service interfaces exposed by a Java class.
- *
- * @version $Rev$ $Date$
- */
-@Target({TYPE})
-@Retention(RUNTIME)
-public @interface Service {
- /**
- * Array of interfaces that should be exposed as services.
- */
- Class<?>[] interfaces() default {};
-
- /**
- * Shortcut allowing a single interface to be exposed.
- */
- Class<?> value() default Void.class;
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Session.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Session.java
deleted file mode 100644
index 11a90d3159..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/Session.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate the characteristics of a session.
- *
- * @version $Rev$ $Date$
- */
-@Target(TYPE)
-@Retention(RUNTIME)
-public @interface Session {
- /**
- * The maximum time that can pass between operations in a single conversation.
- * If this time is exceeded the container may end the conversation.
- */
- public String maxIdleTime() default "";
-
- /**
- * The maximum time that a conversation may remain active.
- * If this time is exceeded the container may end the conversation.
- */
- public String maxAge() default "";
-
- /**
- * If true, indicates that only the user that initiated the conversation
- * has the authority to continue it.
- */
- public boolean singlePrincipal() default false;
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/SessionID.java b/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/SessionID.java
deleted file mode 100644
index 86d9605bb6..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/java/org/osoa/sca/annotations/SessionID.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a field or method that is used to inject the session ID.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface SessionID {
-}
diff --git a/branches/java-M1/java/spec/sca/src/main/resources/META-INF/LICENSE.txt b/branches/java-M1/java/spec/sca/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 25d78feeac..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,1277 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-APACHE TUSCANY SUBCOMPONENTS:
-
-The Apache Tuscany distribution includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================
-
-For the Eclipse Modeling Framework component and the Celtix binding:
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the
-Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this
-Agreement.
-
-"Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor, if
-any, in source code and object code form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow
-Recipient to distribute the Program, it is Recipient's responsibility
-to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the
-Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a
-commercial product offering should do so in a manner which does not
-create potential liability for other Contributors. Therefore, if a
-Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend
-and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising
-from claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the acts
-or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement.
-In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b)
-allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such
-claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable
-laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), 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 OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of
-the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign
-the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions)
-may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives
-no rights or licenses to the intellectual property of any Contributor
-under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.
-
-===============================================================================
-
-For the Rhino JavaScript container component:
-
-Mozilla Public License 1.1 (MPL 1.1)
-
-1. Definitions.
-
- 1.0.1. "Commercial Use" means distribution or otherwise making the
-Covered Code available to a third party.
-
- 1.1. "Contributor" means each entity that creates or contributes to
-the creation of Modifications.
-
- 1.2. "Contributor Version" means the combination of the Original Code,
-prior Modifications used by a Contributor, and the Modifications made by that
-particular Contributor.
-
- 1.3. "Covered Code" means the Original Code or Modifications or the
-combination of the Original Code and Modifications, in each case including
-portions thereof.
-
- 1.4. "Electronic Distribution Mechanism" means a mechanism generally
-accepted in the software development community for the electronic transfer of
-data.
-
- 1.5. "Executable" means Covered Code in any form other than Source
-Code.
-
- 1.6. "Initial Developer" means the individual or entity identified as
-the Initial Developer in the Source Code notice required by Exhibit A.
-
- 1.7. "Larger Work" means a work which combines Covered Code or
-portions thereof with code not governed by the terms of this License.
-
- 1.8. "License" means this document.
-
- 1.8.1. "Licensable" means having the right to grant, to the maximum
-extent possible, whether at the time of the initial grant or subsequently
-acquired, any and all of the rights conveyed herein.
-
- 1.9. "Modifications" means any addition to or deletion from the
-substance or structure of either the Original Code or any previous
-Modifications. When Covered Code is released as a series of files, a
-Modification is:
- A. Any addition to or deletion from the contents of a file
-containing Original Code or previous Modifications.
-
- B. Any new file that contains any part of the Original Code or
-previous Modifications.
-
- 1.10. "Original Code" means Source Code of computer software code
-which is described in the Source Code notice required by Exhibit A as Original
-Code, and which, at the time of its release under this License is not already
-Covered Code governed by this License.
-
- 1.10.1. "Patent Claims" means any patent claim(s), now owned or
-hereafter acquired, including without limitation, method, process, and
-apparatus claims, in any patent Licensable by grantor.
-
- 1.11. "Source Code" means the preferred form of the Covered Code for
-making modifications to it, including all modules it contains, plus any
-associated interface definition files, scripts used to control compilation and
-installation of an Executable, or source code differential comparisons against
-either the Original Code or another well known, available Covered Code of the
-Contributor's choice. The Source Code can be in a compressed or archival form,
-provided the appropriate decompression or de-archiving software is widely
-available for no charge.
-
- 1.12. "You" (or "Your") means an individual or a legal entity
-exercising rights under, and complying with all of the terms of, this License
-or a future version of this License issued under Section 6.1. For legal
-entities, "You" includes any entity which controls, is controlled by, or is
-under common control with You. For purposes of this definition, "control"
-means (a) the power, direct or indirect, to cause the direction or management
-of such entity, whether by contract or otherwise, or (b) ownership of more
-than fifty percent (50%) of the outstanding shares or beneficial ownership of
-such entity.
-
-2. Source Code License.
-
- 2.1. The Initial Developer Grant.
- The Initial Developer hereby grants You a world-wide, royalty-free,
-non-exclusive license, subject to third party intellectual property claims:
- (a) under intellectual property rights (other than patent or
-trademark) Licensable by Initial Developer to use, reproduce, modify, display,
-perform, sublicense and distribute the Original Code (or portions thereof)
-with or without Modifications, and/or as part of a Larger Work; and
-
- (b) under Patents Claims infringed by the making, using or selling
-of Original Code, to make, have made, use, practice, sell, and offer for sale,
-and/or otherwise dispose of the Original Code (or portions thereof).
- (c) the licenses granted in this Section 2.1(a) and
-(b) are effective on the date Initial Developer first distributes Original
-Code under the terms of this License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is
-granted: 1) for code that You delete from the Original Code; 2) separate from
-the Original Code; or 3) for infringements caused by: i) the modification of
-the Original Code or ii) the combination of the Original Code with other
-software or devices.
-
- 2.2. Contributor Grant.
- Subject to third party intellectual property claims, each Contributor
-hereby grants You a world-wide, royalty-free, non-exclusive license
-
- (a) under intellectual property rights (other than patent or
-trademark) Licensable by Contributor, to use, reproduce, modify, display,
-perform, sublicense and distribute the Modifications created by such
-Contributor (or portions thereof) either on an unmodified basis, with other
-Modifications, as Covered Code and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling
-of Modifications made by that Contributor either alone and/or in combination
-with its Contributor Version (or portions of such combination), to make, use,
-sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications
-made by that Contributor (or portions thereof); and 2) the combination of
-Modifications made by that Contributor with its Contributor Version (or
-portions of such combination).
-
- (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-effective on the date Contributor first makes Commercial Use of the Covered
-Code.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is
-granted: 1) for any code that Contributor has deleted from the Contributor
-Version; 2) separate from the Contributor Version; 3) for infringements
-caused by: i) third party modifications of Contributor Version or ii) the
-combination of Modifications made by that Contributor with other software
-(except as part of the Contributor Version) or other devices; or 4) under
-Patent Claims infringed by Covered Code in the absence of Modifications made
-by that Contributor.
-
-
-3. Distribution Obligations.
-
- 3.1. Application of License.
- The Modifications which You create or to which You contribute are
-governed by the terms of this License, including without limitation Section
-2.2. The Source Code version of Covered Code may be distributed only under the
-terms of this License or a future version of this License released under
-Section 6.1, and You must include a copy of this License with every copy of
-the Source Code You distribute. You may not offer or impose any terms on any
-Source Code version that alters or restricts the applicable version of this
-License or the recipients' rights hereunder. However, You may include an
-additional document offering the additional rights described in Section 3.5.
-
- 3.2. Availability of Source Code.
- Any Modification which You create or to which You contribute must be
-made available in Source Code form under the terms of this License either on
-the same media as an Executable version or via an accepted Electronic
-Distribution Mechanism to anyone to whom you made an Executable version
-available; and if made available via Electronic Distribution Mechanism, must
-remain available for at least twelve (12) months after the date it initially
-became available, or at least six (6) months after a subsequent version of
-that particular Modification has been made available to such recipients. You
-are responsible for ensuring that the Source Code version remains available
-even if the Electronic Distribution Mechanism is maintained by a third party.
-
- 3.3. Description of Modifications.
- You must cause all Covered Code to which You contribute to contain a
-file documenting the changes You made to create that Covered Code and the date
-of any change. You must include a prominent statement that the Modification is
-derived, directly or indirectly, from Original Code provided by the Initial
-Developer and including the name of the Initial Developer in (a) the Source
-Code, and (b) in any notice in an Executable version or related documentation
-in which You describe the origin or ownership of the Covered Code.
-
- 3.4. Intellectual Property Matters
- (a) Third Party Claims.
- If Contributor has knowledge that a license under a third party's
-intellectual property rights is required to exercise the rights granted by
-such Contributor under Sections 2.1 or 2.2, Contributor must include a text
-file with the Source Code distribution titled "LEGAL" which describes the
-claim and the party making the claim in sufficient detail that a recipient
-will know whom to contact. If Contributor obtains such knowledge after the
-Modification is made available as described in Section 3.2, Contributor shall
-promptly modify the LEGAL file in all copies Contributor makes available
-thereafter and shall take other steps (such as notifying appropriate mailing
-lists or newsgroups) reasonably calculated to inform those who received the
-Covered Code that new knowledge has been obtained.
-
- (b) Contributor APIs.
- If Contributor's Modifications include an application programming
-interface and Contributor has knowledge of patent licenses which are
-reasonably necessary to implement that API, Contributor must also include this
-information in the LEGAL file.
-
- (c) Representations.
- Contributor represents that, except as disclosed pursuant to
-Section 3.4(a) above, Contributor believes that Contributor's Modifications
-are Contributor's original creation(s) and/or Contributor has sufficient
-rights to grant the rights conveyed by this License.
-
-
- 3.5. Required Notices.
- You must duplicate the notice in Exhibit A in each file of the Source
-Code. If it is not possible to put such notice in a particular Source Code
-file due to its structure, then You must include such notice in a location
-(such as a relevant directory) where a user would be likely to look for such a
-notice. If You created one or more Modification(s) You may add your name as a
-Contributor to the notice described in Exhibit A. You must also duplicate
-this License in any documentation for the Source Code where You describe
-recipients' rights or ownership rights relating to Covered Code. You may
-choose to offer, and to charge a fee for, warranty, support, indemnity or
-liability obligations to one or more recipients of Covered Code. However, You
-may do so only on Your own behalf, and not on behalf of the Initial Developer
-or any Contributor. You must make it absolutely clear than any such warranty,
-support, indemnity or liability obligation is offered by You alone, and You
-hereby agree to indemnify the Initial Developer and every Contributor for any
-liability incurred by the Initial Developer or such Contributor as a result of
-warranty, support, indemnity or liability terms You offer.
-
- 3.6. Distribution of Executable Versions.
- You may distribute Covered Code in Executable form only if the
-requirements of Section 3.1-3.5 have been met for that Covered Code, and if
-You include a notice stating that the Source Code version of the Covered Code
-is available under the terms of this License, including a description of how
-and where You have fulfilled the obligations of Section 3.2. The notice must
-be conspicuously included in any notice in an Executable version, related
-documentation or collateral in which You describe recipients' rights relating
-to the Covered Code. You may distribute the Executable version of Covered Code
-or ownership rights under a license of Your choice, which may contain terms
-different from this License, provided that You are in compliance with the
-terms of this License and that the license for the Executable version does not
-attempt to limit or alter the recipient's rights in the Source Code version
-from the rights set forth in this License. If You distribute the Executable
-version under a different license You must make it absolutely clear that any
-terms which differ from this License are offered by You alone, not by the
-Initial Developer or any Contributor. You hereby agree to indemnify the
-Initial Developer and every Contributor for any liability incurred by the
-Initial Developer or such Contributor as a result of any such terms You offer.
-
- 3.7. Larger Works.
- You may create a Larger Work by combining Covered Code with other code
-not governed by the terms of this License and distribute the Larger Work as a
-single product. In such a case, You must make sure the requirements of this
-License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
- If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Code due to statute,
-judicial order, or regulation then You must: (a) comply with the terms of this
-License to the maximum extent possible; and (b) describe the limitations and
-the code they affect. Such description must be included in the LEGAL file
-described in Section 3.4 and must be included with all distributions of the
-Source Code. Except to the extent prohibited by statute or regulation, such
-description must be sufficiently detailed for a recipient of ordinary skill to
-be able to understand it.
-
-5. Application of this License.
-
- This License applies to code to which the Initial Developer has attached
-the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
- 6.1. New Versions.
- Netscape Communications Corporation ("Netscape") may publish revised
-and/or new versions of the License from time to time. Each version will be
-given a distinguishing version number.
-
- 6.2. Effect of New Versions.
- Once Covered Code has been published under a particular version of the
-License, You may always continue to use it under the terms of that version.
-You may also choose to use such Covered Code under the terms of any subsequent
-version of the License published by Netscape. No one other than Netscape has
-the right to modify the terms applicable to Covered Code created under this
-License.
-
- 6.3. Derivative Works.
- If You create or use a modified version of this License (which you may
-only do in order to apply it to code which is not already Covered Code
-governed by this License), You must (a) rename Your license so that the
-phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL", "NPL" or
-any confusingly similar phrase do not appear in your license (except to note
-that your license differs from this License) and (b) otherwise make it clear
-that Your version of the license contains terms which differ from the Mozilla
-Public License and Netscape Public License. (Filling in the name of the
-Initial Developer, Original Code or Contributor in the notice described in
-Exhibit A shall not of themselves be deemed to be modifications of this
-License.)
-
-7. DISCLAIMER OF WARRANTY.
-
- COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE,
-FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE
-QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED
-CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
-OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
-CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
-LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-DISCLAIMER.
-
-8. TERMINATION.
-
- 8.1. This License and the rights granted hereunder will terminate
-automatically if You fail to comply with terms herein and fail to cure such
-breach within 30 days of becoming aware of the breach. All sublicenses to the
-Covered Code which are properly granted shall survive any termination of this
-License. Provisions which, by their nature, must remain in effect beyond the
-termination of this License shall survive.
-
- 8.2. If You initiate litigation by asserting a patent infringement
-claim (excluding declatory judgment actions) against Initial Developer or a
-Contributor (the Initial Developer or Contributor against whom You file such
-action is referred to as "Participant") alleging that:
-
- (a) such Participant's Contributor Version directly or indirectly
-infringes any patent, then any and all rights granted by such Participant to
-You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
-from Participant terminate prospectively, unless if within 60 days after
-receipt of notice You either: (i) agree in writing to pay Participant a
-mutually agreeable reasonable royalty for Your past and future use of
-Modifications made by such Participant, or (ii) withdraw Your litigation claim
-with respect to the Contributor Version against such Participant. If within
-60 days of notice, a reasonable royalty and payment arrangement are not
-mutually agreed upon in writing by the parties or the litigation claim is not
-withdrawn, the rights granted by Participant to You under Sections 2.1 and/or
-2.2 automatically terminate at the expiration of the 60 day notice period
-specified above.
-
- (b) any software, hardware, or device, other than such Participant's
-Contributor Version, directly or indirectly infringes any patent, then any
-rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are
-revoked effective as of the date You first made, used, sold, distributed, or
-had made, Modifications made by that Participant.
-
- 8.3. If You assert a patent infringement claim against Participant
-alleging that such Participant's Contributor Version directly or indirectly
-infringes any patent where such claim is resolved (such as by license or
-settlement) prior to the initiation of patent infringement litigation, then
-the reasonable value of the licenses granted by such Participant under
-Sections 2.1 or 2.2 shall be taken into account in determining the amount or
-value of any payment or license.
-
- 8.4. In the event of termination under Sections 8.1 or 8.2 above, all
-end user license agreements (excluding distributors and resellers) which have
-been validly granted by You or any distributor hereunder prior to termination
-shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY
-SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
-SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
-WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
-FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES,
-EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH
-DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH
-OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
-EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
- The Covered Code is a "commercial item," as that term is defined in 48
-C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and
-"commercial computer software documentation," as such terms are used in 48
-C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
-227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users
-acquire Covered Code with only those rights set forth herein.
-
-11. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject matter
-hereof. If any provision of this License is held to be unenforceable, such
-provision shall be reformed only to the extent necessary to make it
-enforceable. This License shall be governed by California law provisions
-(except to the extent applicable law, if any, provides otherwise), excluding
-its conflict-of-law provisions. With respect to disputes in which at least one
-party is a citizen of, or an entity chartered or registered to do business in
-the United States of America, any litigation relating to this License shall be
-subject to the jurisdiction of the Federal Courts of the Northern District of
-California, with venue lying in Santa Clara County, California, with the
-losing party responsible for costs, including without limitation, court costs
-and reasonable attorneys' fees and expenses. The application of the United
-Nations Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any law or regulation which provides that the language of
-a contract shall be construed against the drafter shall not apply to this
-License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
-responsible for claims and damages arising, directly or indirectly, out of its
-utilization of rights under this License and You agree to work with Initial
-Developer and Contributors to distribute such responsibility on an equitable
-basis. Nothing herein is intended or shall be deemed to constitute any
-admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
- Initial Developer may designate portions of the Covered Code as
-Multiple-Licensed. Multiple-Licensed means that the Initial Developer permits
-you to utilize portions of the Covered Code under Your choice of the MPL or
-the alternative licenses, if any, specified by the Initial Developer in the
-file described in Exhibit A.
-
-
-EXHIBIT A -Mozilla Public License.
-
- ``The contents of this file are subject to the Mozilla Public License
-Version 1.1 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF
- ANY KIND, either express or implied. See the License for the specific
-language governing rights and
- limitations under the License.
-
- The Original Code is ______________________________________.
-
- The Initial Developer of the Original Code is ________________________.
-Portions created by
- ______________________ are Copyright (C) ______
-_______________________. All Rights
- Reserved.
-
- Contributor(s): ______________________________________.
-
- Alternatively, the contents of this file may be used under the terms of
-the _____ license (the [___] License), in which case the provisions of
-[______] License are applicable instead of those above. If you wish to allow
-use of your version of this file only under the terms of the [____] License
-and not to allow others to use your version of this file under the MPL,
-indicate your decision by deleting the provisions above and replace them
-with the notice and other provisions required by the [___] License. If you do
-not delete the provisions above, a recipient may use your version of this file
-under either the MPL or the [___] License."
-
- [NOTE: The text of this Exhibit A may differ slightly from the text of
-the notices in the Source Code files of the Original Code. You should use the
-text of this Exhibit A rather than the text found in the Original Code Source
-Code for Your Modifications.]
-
-
-===============================================================================
-
-For the JAX-WS Reference Implementation component:
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
- 1. Definitions.
-
- 1.1. "Contributor" means each individual or entity that
- creates or contributes to the creation of Modifications.
-
- 1.2. "Contributor Version" means the combination of the
- Original Software, prior Modifications used by a
- Contributor (if any), and the Modifications made by that
- particular Contributor.
-
- 1.3. "Covered Software" means (a) the Original Software, or
- (b) Modifications, or (c) the combination of files
- containing Original Software with files containing
- Modifications, in each case including portions thereof.
-
- 1.4. "Executable" means the Covered Software in any form
- other than Source Code.
-
- 1.5. "Initial Developer" means the individual or entity
- that first makes Original Software available under this
- License.
-
- 1.6. "Larger Work" means a work which combines Covered
- Software or portions thereof with code not governed by the
- terms of this License.
-
- 1.7. "License" means this document.
-
- 1.8. "Licensable" means having the right to grant, to the
- maximum extent possible, whether at the time of the initial
- grant or subsequently acquired, any and all of the rights
- conveyed herein.
-
- 1.9. "Modifications" means the Source Code and Executable
- form of any of the following:
-
- A. Any file that results from an addition to,
- deletion from or modification of the contents of a
- file containing Original Software or previous
- Modifications;
-
- B. Any new file that contains any part of the
- Original Software or previous Modification; or
-
- C. Any new file that is contributed or otherwise made
- available under the terms of this License.
-
- 1.10. "Original Software" means the Source Code and
- Executable form of computer software code that is
- originally released under this License.
-
- 1.11. "Patent Claims" means any patent claim(s), now owned
- or hereafter acquired, including without limitation,
- method, process, and apparatus claims, in any patent
- Licensable by grantor.
-
- 1.12. "Source Code" means (a) the common form of computer
- software code in which modifications are made and (b)
- associated documentation included in or with such code.
-
- 1.13. "You" (or "Your") means an individual or a legal
- entity exercising rights under, and complying with all of
- the terms of, this License. For legal entities, "You"
- includes any entity which controls, is controlled by, or is
- under common control with You. For purposes of this
- definition, "control" means (a) the power, direct or
- indirect, to cause the direction or management of such
- entity, whether by contract or otherwise, or (b) ownership
- of more than fifty percent (50%) of the outstanding shares
- or beneficial ownership of such entity.
-
- 2. License Grants.
-
- 2.1. The Initial Developer Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and
- subject to third party intellectual property claims, the
- Initial Developer hereby grants You a world-wide,
- royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than
- patent or trademark) Licensable by Initial Developer,
- to use, reproduce, modify, display, perform,
- sublicense and distribute the Original Software (or
- portions thereof), with or without Modifications,
- and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making,
- using or selling of Original Software, to make, have
- made, use, practice, sell, and offer for sale, and/or
- otherwise dispose of the Original Software (or
- portions thereof).
-
- (c) The licenses granted in Sections 2.1(a) and (b)
- are effective on the date Initial Developer first
- distributes or otherwise makes the Original Software
- available to a third party under the terms of this
- License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent
- license is granted: (1) for code that You delete from
- the Original Software, or (2) for infringements
- caused by: (i) the modification of the Original
- Software, or (ii) the combination of the Original
- Software with other software or devices.
-
- 2.2. Contributor Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and
- subject to third party intellectual property claims, each
- Contributor hereby grants You a world-wide, royalty-free,
- non-exclusive license:
-
- (a) under intellectual property rights (other than
- patent or trademark) Licensable by Contributor to
- use, reproduce, modify, display, perform, sublicense
- and distribute the Modifications created by such
- Contributor (or portions thereof), either on an
- unmodified basis, with other Modifications, as
- Covered Software and/or as part of a Larger Work; and
-
-
- (b) under Patent Claims infringed by the making,
- using, or selling of Modifications made by that
- Contributor either alone and/or in combination with
- its Contributor Version (or portions of such
- combination), to make, use, sell, offer for sale,
- have made, and/or otherwise dispose of: (1)
- Modifications made by that Contributor (or portions
- thereof); and (2) the combination of Modifications
- made by that Contributor with its Contributor Version
- (or portions of such combination).
-
- (c) The licenses granted in Sections 2.2(a) and
- 2.2(b) are effective on the date Contributor first
- distributes or otherwise makes the Modifications
- available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent
- license is granted: (1) for any code that Contributor
- has deleted from the Contributor Version; (2) for
- infringements caused by: (i) third party
- modifications of Contributor Version, or (ii) the
- combination of Modifications made by that Contributor
- with other software (except as part of the
- Contributor Version) or other devices; or (3) under
- Patent Claims infringed by Covered Software in the
- absence of Modifications made by that Contributor.
-
- 3. Distribution Obligations.
-
- 3.1. Availability of Source Code.
-
- Any Covered Software that You distribute or otherwise make
- available in Executable form must also be made available in
- Source Code form and that Source Code form must be
- distributed only under the terms of this License. You must
- include a copy of this License with every copy of the
- Source Code form of the Covered Software You distribute or
- otherwise make available. You must inform recipients of any
- such Covered Software in Executable form as to how they can
- obtain such Covered Software in Source Code form in a
- reasonable manner on or through a medium customarily used
- for software exchange.
-
- 3.2. Modifications.
-
- The Modifications that You create or to which You
- contribute are governed by the terms of this License. You
- represent that You believe Your Modifications are Your
- original creation(s) and/or You have sufficient rights to
- grant the rights conveyed by this License.
-
- 3.3. Required Notices.
-
- You must include a notice in each of Your Modifications
- that identifies You as the Contributor of the Modification.
- You may not remove or alter any copyright, patent or
- trademark notices contained within the Covered Software, or
- any notices of licensing or any descriptive text giving
- attribution to any Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms.
-
- You may not offer or impose any terms on any Covered
- Software in Source Code form that alters or restricts the
- applicable version of this License or the recipients'
- rights hereunder. You may choose to offer, and to charge a
- fee for, warranty, support, indemnity or liability
- obligations to one or more recipients of Covered Software.
- However, you may do so only on Your own behalf, and not on
- behalf of the Initial Developer or any Contributor. You
- must make it absolutely clear that any such warranty,
- support, indemnity or liability obligation is offered by
- You alone, and You hereby agree to indemnify the Initial
- Developer and every Contributor for any liability incurred
- by the Initial Developer or such Contributor as a result of
- warranty, support, indemnity or liability terms You offer.
-
-
- 3.5. Distribution of Executable Versions.
-
- You may distribute the Executable form of the Covered
- Software under the terms of this License or under the terms
- of a license of Your choice, which may contain terms
- different from this License, provided that You are in
- compliance with the terms of this License and that the
- license for the Executable form does not attempt to limit
- or alter the recipient's rights in the Source Code form
- from the rights set forth in this License. If You
- distribute the Covered Software in Executable form under a
- different license, You must make it absolutely clear that
- any terms which differ from this License are offered by You
- alone, not by the Initial Developer or Contributor. You
- hereby agree to indemnify the Initial Developer and every
- Contributor for any liability incurred by the Initial
- Developer or such Contributor as a result of any such terms
- You offer.
-
- 3.6. Larger Works.
-
- You may create a Larger Work by combining Covered Software
- with other code not governed by the terms of this License
- and distribute the Larger Work as a single product. In such
- a case, You must make sure the requirements of this License
- are fulfilled for the Covered Software.
-
- 4. Versions of the License.
-
- 4.1. New Versions.
-
- Sun Microsystems, Inc. is the initial license steward and
- may publish revised and/or new versions of this License
- from time to time. Each version will be given a
- distinguishing version number. Except as provided in
- Section 4.3, no one other than the license steward has the
- right to modify this License.
-
- 4.2. Effect of New Versions.
-
- You may always continue to use, distribute or otherwise
- make the Covered Software available under the terms of the
- version of the License under which You originally received
- the Covered Software. If the Initial Developer includes a
- notice in the Original Software prohibiting it from being
- distributed or otherwise made available under any
- subsequent version of the License, You must distribute and
- make the Covered Software available under the terms of the
- version of the License under which You originally received
- the Covered Software. Otherwise, You may also choose to
- use, distribute or otherwise make the Covered Software
- available under the terms of any subsequent version of the
- License published by the license steward.
-
- 4.3. Modified Versions.
-
- When You are an Initial Developer and You want to create a
- new license for Your Original Software, You may create and
- use a modified version of this License if You: (a) rename
- the license and remove any references to the name of the
- license steward (except to note that the license differs
- from this License); and (b) otherwise make it clear that
- the license contains terms which differ from this License.
-
-
- 5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
- BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
- INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
- SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
- PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
- PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
- COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
- INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
- ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
- WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
- ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
- DISCLAIMER.
-
- 6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will
- terminate automatically if You fail to comply with terms
- herein and fail to cure such breach within 30 days of
- becoming aware of the breach. Provisions which, by their
- nature, must remain in effect beyond the termination of
- this License shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding
- declaratory judgment actions) against Initial Developer or
- a Contributor (the Initial Developer or Contributor against
- whom You assert such claim is referred to as "Participant")
- alleging that the Participant Software (meaning the
- Contributor Version where the Participant is a Contributor
- or the Original Software where the Participant is the
- Initial Developer) directly or indirectly infringes any
- patent, then any and all rights granted directly or
- indirectly to You by such Participant, the Initial
- Developer (if the Initial Developer is not the Participant)
- and all Contributors under Sections 2.1 and/or 2.2 of this
- License shall, upon 60 days notice from Participant
- terminate prospectively and automatically at the expiration
- of such 60 day notice period, unless if within such 60 day
- period You withdraw Your claim with respect to the
- Participant Software against such Participant either
- unilaterally or pursuant to a written agreement with
- Participant.
-
- 6.3. In the event of termination under Sections 6.1 or 6.2
- above, all end user licenses that have been validly granted
- by You or any distributor hereunder prior to termination
- (excluding licenses granted to You by any distributor)
- shall survive termination.
-
- 7. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
- (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
- INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
- COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
- LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
- CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
- LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
- STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
- COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
- INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
- LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
- INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
- APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
- NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
- CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
- APPLY TO YOU.
-
- 8. U.S. GOVERNMENT END USERS.
-
- The Covered Software is a "commercial item," as that term is
- defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
- computer software" (as that term is defined at 48 C.F.R.
- 252.227-7014(a)(1)) and "commercial computer software
- documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
- 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
- through 227.7202-4 (June 1995), all U.S. Government End Users
- acquire Covered Software with only those rights set forth herein.
- This U.S. Government Rights clause is in lieu of, and supersedes,
- any other FAR, DFAR, or other clause or provision that addresses
- Government rights in computer software under this License.
-
- 9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject
- matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the
- extent necessary to make it enforceable. This License shall be
- governed by the law of the jurisdiction specified in a notice
- contained within the Original Software (except to the extent
- applicable law, if any, provides otherwise), excluding such
- jurisdiction's conflict-of-law provisions. Any litigation
- relating to this License shall be subject to the jurisdiction of
- the courts located in the jurisdiction and venue specified in a
- notice contained within the Original Software, with the losing
- party responsible for costs, including, without limitation, court
- costs and reasonable attorneys' fees and expenses. The
- application of the United Nations Convention on Contracts for the
- International Sale of Goods is expressly excluded. Any law or
- regulation which provides that the language of a contract shall
- be construed against the drafter shall not apply to this License.
- You agree that You alone are responsible for compliance with the
- United States export administration regulations (and the export
- control laws and regulation of any other countries) when You use,
- distribute or otherwise make available any Covered Software.
-
- 10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
- responsible for claims and damages arising, directly or
- indirectly, out of its utilization of rights under this License
- and You agree to work with Initial Developer and Contributors to
- distribute such responsibility on an equitable basis. Nothing
- herein is intended or shall be deemed to constitute any admission
- of liability.
-
diff --git a/branches/java-M1/java/spec/sca/src/main/resources/META-INF/MANIFEST.MF b/branches/java-M1/java/spec/sca/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index ff2f248c25..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Extension-Name: sca-api
-Specification-Title: SCA API
-Specification-Vendor: Apache Software Foundation
-Implementation-Vendor: Apache Software Foundation
-Implementation-Vendor-Id: org.apache
-Implementation-Title: sca-api
-Implementation-Version: incubating-M1
-Bundle-ManifestVersion: 2
-Bundle-Name: SDO API
-Bundle-SymbolicName: org.apache.tuscany.sca.spec
-Bundle-Version: 1.0.0
-Bundle-Vendor: Apache Software Foundation
-Export-Package: org.osoa.sca,
- org.osoa.sca.annotations,
- org.osoa.sca.model
diff --git a/branches/java-M1/java/spec/sca/src/main/resources/META-INF/NOTICE b/branches/java-M1/java/spec/sca/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index d48810c0ec..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,18 +0,0 @@
-=========================================================================
-== NOTICE file corresponding to the section 4 d of ==
-== the Apache License, Version 2.0, ==
-== in this case for the Apache Tuscany distribution. ==
-=========================================================================
-
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
-
-This product also includes software developed by:
-- the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-- the Celtix project (http://celtix.objectweb.org/)
-- the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-- the GlassFish JAX-WS project (https://jax-ws.dev.java.net/)
-
-Please read the LICENSE.txt file present in the root directory of this
-distribution.
-
diff --git a/branches/java-M1/java/spec/sca/src/main/resources/META-INF/README.txt b/branches/java-M1/java/spec/sca/src/main/resources/META-INF/README.txt
deleted file mode 100644
index 9b26d1690a..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/resources/META-INF/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Apache Tuscany M1 build (May, 2006)
-===================================
-
-http://incubator.apache.org/tuscany/
-
-Tuscany is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Web Services PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
-
-
-Support
--------
-
-Any problem with this release can be reported to the Tuscany mailing list
-or in the JIRA issue tracker.
-
-Mailing list subscription:
- tuscany-dev-subscribe@ws.apache.org
-
-Jira:
- http://issues.apache.org/jira/browse/Tuscany
-
-
-Thank you for using Tuscany!
-
-
-The Tuscany Team.
-
diff --git a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-binding-sca.xsd b/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-binding-sca.xsd
deleted file mode 100644
index cf2a75f5bc..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-binding-sca.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
- xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core.xsd"/>
-
- <element name="binding.sca" type="sca:SCABinding" substitutionGroup="sca:binding"/>
- <complexType name="SCABinding">
- <complexContent>
- <extension base="sca:Binding">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-</schema>
diff --git a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-binding-webservice.xsd b/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-binding-webservice.xsd
deleted file mode 100644
index a22a44db0a..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-binding-webservice.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
- xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core.xsd"/>
-
- <element name="binding.ws" type="sca:WebServiceBinding" substitutionGroup="sca:binding"/>
- <complexType name="WebServiceBinding">
- <complexContent>
- <extension base="sca:Binding">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="port" type="anyURI" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-</schema>
diff --git a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-core.xsd b/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-core.xsd
deleted file mode 100644
index 866c4a1189..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-core.xsd
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
- xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
- elementFormDefault="qualified">
-
- <element name="componentType" type="sca:ComponentType"/>
- <complexType name="ComponentType">
- <sequence>
- <element minOccurs="0" maxOccurs="unbounded" name="service" type="sca:Service"/>
- <element minOccurs="0" maxOccurs="unbounded" name="reference" type="sca:Reference"/>
- <element minOccurs="0" maxOccurs="unbounded" name="property" type="sca:Property"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="Service">
- <sequence>
- <element minOccurs="1" maxOccurs="1" ref="sca:interface"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <element name="interface" type="sca:Interface"/>
- <complexType name="Interface"/>
-
- <complexType name="Reference">
- <sequence>
- <element minOccurs="1" maxOccurs="1" ref="sca:interface"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="Property">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="type" type="QName" use="required"/>
- <attribute name="many" type="boolean" default="false" use="optional"/>
- <attribute name="required" type="boolean" default="false" use="optional"/>
- <attribute name="default" type="string" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
-
- <element name="moduleFragment" type="sca:ModuleFragment"/>
- <complexType name="ModuleFragment">
- <sequence>
- <element minOccurs="0" maxOccurs="unbounded" name="entryPoint" type="sca:EntryPoint"/>
- <element minOccurs="0" maxOccurs="unbounded" name="component" type="sca:Component"/>
- <element minOccurs="0" maxOccurs="unbounded" name="externalService" type="sca:ExternalService"/>
- <element minOccurs="0" maxOccurs="unbounded" name="wire" type="sca:ModuleWire"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <element name="module" type="sca:Module"/>
- <complexType name="Module">
- <complexContent>
- <extension base="sca:ModuleFragment"/>
- </complexContent>
- </complexType>
-
- <complexType name="EntryPoint">
- <sequence>
- <element minOccurs="0" maxOccurs="1" ref="sca:interface"/>
- <element minOccurs="1" maxOccurs="unbounded" ref="sca:binding"/>
- <element minOccurs="1" maxOccurs="unbounded" name="reference" type="anyURI"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
- <!-- a multiplicity 1..1 or 0..n sample
- <reference>StockQuoteComponent</reference> - type must be URI
- a multiplicity 1..n or 0..n sample
- <reference>StockQuoteComponent1</reference> - type must be URI
- <reference>StockQuoteComponent2</reference>
- -->
-
- <element name="binding" type="sca:Binding"/>
- <complexType name="Binding">
- <attribute name="uri" type="anyURI" use="optional"/>
- </complexType>
-
- <complexType name="Component">
- <sequence>
- <element minOccurs="1" maxOccurs="1" ref="sca:implementation"/>
- <element minOccurs="0" maxOccurs="1" name="properties" type="sca:PropertyValues"/>
- <element minOccurs="0" maxOccurs="1" name="references" type="sca:ReferenceValues"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
- <!-- a multiplicity 1..1 or 0..1 sample
- <references>
- <v:stockQuote>StockQuoteComponent</v:stockquote> - type must be URI
- </references>
- a multiplicity 1..n or 0..n sample
- <references>
- <v:stockQuote>StockQuoteComponent1</v:stockQuote> - type must be URI
- <v:stockQuote>StockQuoteComponent2</v:stockQuote>
- </references>
- -->
-
- <element name="implementation" type="sca:Implementation"/>
- <complexType name="Implementation"/>
-
- <complexType name="PropertyValues">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="ReferenceValues">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
-
- <complexType name="ExternalService">
- <sequence>
- <element minOccurs="1" maxOccurs="1" ref="sca:interface"/>
- <element minOccurs="0" maxOccurs="unbounded" ref="sca:binding"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="overridable" type="sca:OverrideOptions" default="may" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
-
- <complexType name="ModuleWire">
- <sequence>
- <element minOccurs="1" maxOccurs="1" ref="sca:source.uri"/>
- <element minOccurs="1" maxOccurs="1" ref="sca:target.uri"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <element name="source" type="anyType"/>
- <element name="target" type="anyType"/>
-
- <element name="source.uri" type="anyURI" substitutionGroup="sca:source"/>
- <element name="target.uri" type="anyURI" substitutionGroup="sca:target"/>
-
- <element name="subsystem" type="sca:Subsystem"/>
- <complexType name="Subsystem">
- <sequence>
- <element minOccurs="0" maxOccurs="unbounded" name="entryPoint" type="sca:EntryPoint"/>
- <element minOccurs="0" maxOccurs="unbounded" name="moduleComponent" type="sca:ModuleComponent"/>
- <element minOccurs="0" maxOccurs="unbounded" name="externalService" type="sca:ExternalService"/>
- <element minOccurs="0" maxOccurs="unbounded" name="wire" type="sca:SystemWire"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="uri" type="anyURI" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="ModuleComponent">
- <sequence>
- <element minOccurs="0" maxOccurs="1" name="properties" type="sca:PropertyValues"/>
- <element minOccurs="0" maxOccurs="1" name="references" type="sca:ReferenceValues"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="module" type="NCName" use="required"/>
- <attribute name="uri" type="anyURI" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="SystemWire">
- <sequence>
- <element minOccurs="1" maxOccurs="1" ref="sca:source"/>
- <element minOccurs="1" maxOccurs="1" ref="sca:target"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <element name="source.epr" type="anyType" substitutionGroup="sca:source"/>
- <element name="target.epr" type="anyType" substitutionGroup="sca:target"/>
-
- <simpleType name="Multiplicity">
- <restriction base="string">
- <enumeration value="0..1"/>
- <enumeration value="1..1"/>
- <enumeration value="0..n"/>
- <enumeration value="1..n"/>
- </restriction>
- </simpleType>
-
- <simpleType name="OverrideOptions">
- <restriction base="string">
- <enumeration value="no"/>
- <enumeration value="may"/>
- <enumeration value="must"/>
- </restriction>
- </simpleType>
-
-</schema>
diff --git a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-implementation-java.xsd b/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-implementation-java.xsd
deleted file mode 100644
index 87ead7a07d..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-implementation-java.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
- xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core.xsd"/>
-
- <element name="implementation.java" type="sca:JavaImplementation" substitutionGroup="sca:implementation"/>
- <complexType name="JavaImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="class" type="NCName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-</schema>
diff --git a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-interface-java.xsd b/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-interface-java.xsd
deleted file mode 100644
index eb7ab1cd25..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-interface-java.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
- xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core.xsd"/>
-
- <element name="interface.java" type="sca:JavaInterface" substitutionGroup="sca:interface"/>
- <complexType name="JavaInterface">
- <complexContent>
- <extension base="sca:Interface">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="interface" type="NCName" use="required"/>
- <attribute name="callbackInterface" type="NCName" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-</schema>
diff --git a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-interface-wsdl.xsd b/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-interface-wsdl.xsd
deleted file mode 100644
index fe81e6bca5..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca-interface-wsdl.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
- xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core.xsd"/>
-
- <element name="interface.wsdl" type="sca:WSDLPortType" substitutionGroup="sca:interface"/>
- <complexType name="WSDLPortType">
- <complexContent>
- <extension base="sca:Interface">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="interface" type="anyURI" use="required"/>
- <attribute name="callbackInterface" type="anyURI" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-</schema>
diff --git a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca.xsd b/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca.xsd
deleted file mode 100644
index 1159726be0..0000000000
--- a/branches/java-M1/java/spec/sca/src/main/resources/schemas/sca.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
- xmlns:sca="http://www.osoa.org/xmlns/sca/0.9">
-
- <include schemaLocation="sca-core.xsd"/>
-
- <include schemaLocation="sca-interface-java.xsd"/>
- <include schemaLocation="sca-interface-wsdl.xsd"/>
-
- <include schemaLocation="sca-implementation-java.xsd"/>
-
- <include schemaLocation="sca-binding-webservice.xsd"/>
- <include schemaLocation="sca-binding-sca.xsd"/>
-
-</schema>
diff --git a/branches/java-M1/java/spec/sca/src/test/java/org/osoa/sca/annotations/CallbackTestCase.java b/branches/java-M1/java/spec/sca/src/test/java/org/osoa/sca/annotations/CallbackTestCase.java
deleted file mode 100644
index 0fa278110a..0000000000
--- a/branches/java-M1/java/spec/sca/src/test/java/org/osoa/sca/annotations/CallbackTestCase.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-import org.osoa.sca.annotations.usage.CallbackType;
-
-/**
- * Test case for callback annotation.
- *
- * @version $Rev$ $Date$
- */
-public class CallbackTestCase extends TestCase {
- private Class<?> type;
- private Field field;
- private Method method;
-
- /**
- * Test annotation of a callback interface.
- */
- public void testTypeDeclaration() {
- assertTrue(type.isAnnotationPresent(Callback.class));
- Callback callback = type.getAnnotation(Callback.class);
- assertEquals(Object.class, callback.value());
- }
-
- /**
- * Test annotation of a private field.
- */
- public void testField() {
- assertTrue(field.isAnnotationPresent(Callback.class));
- Callback callback = field.getAnnotation(Callback.class);
- assertEquals(Void.class, callback.value());
- }
-
- /**
- * Test annotation of a method.
- */
- public void testMethod() {
- assertTrue(method.isAnnotationPresent(Callback.class));
- Callback callback = method.getAnnotation(Callback.class);
- assertEquals(Void.class, callback.value());
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- type = CallbackType.class;
- field = type.getDeclaredField("cbField");
- method = type.getMethod("cbMethod");
- }
-} \ No newline at end of file
diff --git a/branches/java-M1/java/spec/sca/src/test/java/org/osoa/sca/annotations/usage/CallbackType.java b/branches/java-M1/java/spec/sca/src/test/java/org/osoa/sca/annotations/usage/CallbackType.java
deleted file mode 100644
index 8d75c69ac5..0000000000
--- a/branches/java-M1/java/spec/sca/src/test/java/org/osoa/sca/annotations/usage/CallbackType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.osoa.sca.annotations.usage;
-
-import org.osoa.sca.annotations.Callback;
-
-/**
- * Mock object for callback annotation tests.
- *
- * @version $Rev$ $Date$
- */
-@Callback(Object.class)
-public class CallbackType {
- @Callback
- private Object cbField;
-
- /**
- * Site for testing annotation of a public method.
- */
- @Callback
- public void cbMethod() {
- cbField = new Object();
- }
-
- /**
- * Mock method to make IDEs stop complaining.
- *
- * @return nothing
- */
- public Object getCbField() {
- return cbField;
- }
-}
diff --git a/branches/java-M1/java/spec/sdo/pom.xml b/branches/java-M1/java/spec/sdo/pom.xml
deleted file mode 100644
index c163cb1a89..0000000000
--- a/branches/java-M1/java/spec/sdo/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<project>
- <parent>
- <groupId>org.osoa</groupId>
- <artifactId>spec</artifactId>
- <version>incubating-M1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>commonj</groupId>
- <artifactId>sdo-api</artifactId>
- <name>SDO API</name>
- <version>incubating-M1</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/ChangeSummary.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/ChangeSummary.java
deleted file mode 100644
index 3eeacf4c01..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/ChangeSummary.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo;
-
-import java.util.List;
-
-/**
- * A change summary is used to record changes to DataObjects,
- * allowing applications to efficiently and incrementally update back-end storage when required.
- */
-public interface ChangeSummary
-{
- /**
- * Indicates whether change logging is on (<code>true</code>) or off (<code>false</code>).
- * @return <code>true</code> if change logging is on.
- * @see #beginLogging
- * @see #endLogging
- */
- boolean isLogging();
-
- /**
- * Returns the {@link DataGraph data graph} associated with this change summary or null.
- * @return the data graph.
- * @see DataGraph#getChangeSummary
- */
- DataGraph getDataGraph();
-
- /**
- * Returns a list consisting of all the {@link DataObject data objects} that have been changed while {@link #isLogging logging}.
- * <p>
- * The {@link #isCreated new} and {@link #isModified modified} objects in the List are references to objects
- * associated with this ChangeSummary.
- * The {@link #isDeleted deleted} objects in the List are references to objects
- * at the time that event logging was enabled;
- * <p> Each changed object must have exactly one of the following methods return true:
- * {@link #isCreated isCreated},
- * {@link #isDeleted isDeleted}, or
- * {@link #isModified isModified}.
- * @return a list of changed data objects.
- * @see #isCreated(DataObject)
- * @see #isDeleted(DataObject)
- * @see #isModified(DataObject)
- */
- List /*DataObject*/ getChangedDataObjects();
-
- /**
- * Returns whether or not the specified data object was created while {@link #isLogging logging}.
- * Any object that was added to the scope
- * but was not in the scope when logging began,
- * will be considered created.
- * @param dataObject the data object in question.
- * @return <code>true</code> if the specified data object was created.
- * @see #getChangedDataObjects
- */
- boolean isCreated(DataObject dataObject);
-
- /**
- * Returns whether or not the specified data object was deleted while {@link #isLogging logging}.
- * Any object that is not in scope but was in scope when logging began
- * will be considered deleted.
- * @param dataObject the data object in question.
- * @return <code>true</code> if the specified data object was deleted.
- * @see #getChangedDataObjects
- */
- boolean isDeleted(DataObject dataObject);
-
- /**
- * A setting encapsulates a {@link Property property} and a corresponding single value of the property's {@link Property#getType type}.
- */
- public interface Setting
- {
- /**
- * Returns the property of the setting.
- * @return the setting property.
- */
- Property getProperty();
-
- /**
- * Returns the value of the setting.
- * @return the setting value.
- */
- Object getValue();
-
- /**
- * Returns whether or not the property is set.
- * @return <code>true</code> if the property is set.
- */
- boolean isSet();
- }
-
- /**
- * Returns a list of {@link ChangeSummary.Setting settings}
- * that represent the property values of the given <code>dataObject</code>
- * at the point when logging {@link #beginLogging() began}.
- * <p>In the case of a {@link #isDeleted(DataObject) deleted} object,
- * the List will include settings for all the Properties.
- * <p> An old value setting indicates the value at the
- * point logging begins. A setting is only produced for
- * {@link #isModified modified} objects if
- * either the old value differs from the current value or
- * if the isSet differs from the current value.
- * <p> No settings are produced for {@link #isCreated created} objects.
- * @param dataObject the object in question.
- * @return a list of settings.
- * @see #getChangedDataObjects
- */
- List /*ChangeSummary.Setting*/ getOldValues(DataObject dataObject);
-
- /**
- * Clears the List of {@link #getChangedDataObjects changes} and turns change logging on.
- * No operation occurs if logging is already on.
- * @see #endLogging
- * @see #isLogging
- */
- void beginLogging();
-
- /**
- * An implementation that requires logging may throw an UnsupportedOperationException.
- * Turns change logging off. No operation occurs if logging is already off.
- * @see #beginLogging
- * @see #isLogging
- */
- void endLogging();
-
-
- /**
- * Returns whether or not the specified data object was updated while {@link #isLogging logging}.
- * An object that was contained in the scope when logging began
- * and remains in the scope when logging ends will be considered potentially modified.
- * <p> An object considered modified must have at least one old value setting.
- * @param dataObject the data object in question.
- * @return <code>true</code> if the specified data object was modified.
- * @see #getChangedDataObjects
- */
- boolean isModified(DataObject dataObject);
-
- /**
- * Returns the ChangeSummary root DataObject - the object from which
- * changes are tracked.
- * When a DataGraph is used, this is the same as getDataGraph().getRootObject().
- * @return the ChangeSummary root DataObject
- */
- DataObject getRootObject();
-
- /**
- * Returns a {@link ChangeSummary.Setting setting} for the specified property
- * representing the property value of the given <code>dataObject</code>
- * at the point when logging {@link #beginLogging() began}.
- * <p>Returns null if the property was not modified and
- * has not been {@link #isDeleted(DataObject) deleted}.
- * @param dataObject the object in question.
- * @param property the property of the object.
- * @return the Setting for the specified property.
- * @see #getChangedDataObjects
- */
- Setting getOldValue(DataObject dataObject, Property property);
-
- /**
- * Returns the value of the {@link DataObject#getContainer container} data object
- * at the point when logging {@link #beginLogging() began}.
- * @param dataObject the object in question.
- * @return the old container data object.
- */
- DataObject getOldContainer(DataObject dataObject);
-
- /**
- * Returns the value of the {@link DataObject#getContainmentProperty containment property} data object property
- * at the point when logging {@link #beginLogging() began}.
- * @param dataObject the object in question.
- * @return the old containment property.
- */
- Property getOldContainmentProperty(DataObject dataObject);
-
- /**
- * Returns the value of the {@link DataObject#getSequence sequence} for the data object
- * at the point when logging {@link #beginLogging() began}.
- * @param dataObject the object in question.
- * @return the old containment property.
- */
- Sequence getOldSequence(DataObject dataObject);
-
- /**
- * This method is intended for use by service implementations only.
- * Undoes all changes in the log to restore the tree of
- * DataObjects to its original state when logging began.
- * isLogging() is unchanged. The log is cleared.
- * @see #beginLogging
- * @see #endLogging
- * @see #isLogging
- */
- void undoChanges();
-
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/DataGraph.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/DataGraph.java
deleted file mode 100644
index 78bc7227a1..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/DataGraph.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo;
-
-import java.io.Serializable;
-
-/**
- * A data graph is used to package a graph of {@link DataObject data objects} along with their
- * metadata, that is, data describing the data.
- * A data graph also contains a {@link #getChangeSummary change summary}
- * which is used to record changes made to the objects in the graph.
- */
-
-public interface DataGraph extends Serializable
-{
- /**
- * Returns the root {@link DataObject data object} of this data graph.
- * @return the root data object.
- * @see DataObject#getDataGraph
- */
- DataObject getRootObject();
-
- /**
- * Returns the {@link ChangeSummary change summary} associated with this data graph.
- * @return the change summary.
- * @see ChangeSummary#getDataGraph
- */
- ChangeSummary getChangeSummary();
-
- /**
- * Returns the {@link Type type} with the given the {@link Type#getURI() URI},
- * or contained by the resource at the given URI,
- * and with the given {@link Type#getName name}.
- * @param uri the namespace URI of a type or the location URI of a resource containing a type.
- * @param typeName name of a type.
- * @return the type with the corresponding namespace and name.
- */
- Type getType(String uri, String typeName);
-
- /**
- * Creates a new root data object of the {@link #getType specified type}.
- * An exception is thrown if a root object exists.
- * @param namespaceURI namespace of the type.
- * @param typeName name of the type.
- * @return the new root.
- * @throws IllegalStateException if the root object already exists.
- * @see #createRootObject(Type)
- * @see #getType(String, String)
- */
- DataObject createRootObject(String namespaceURI, String typeName);
-
- /**
- * Creates a new root data object of the specified type.
- * An exception is thrown if a root object exists.
- * @param type the type of the new root.
- * @return the new root.
- * @throws IllegalStateException if the root object already exists.
- * @see #createRootObject(String, String)
- */
- DataObject createRootObject(Type type);
-
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/DataObject.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/DataObject.java
deleted file mode 100644
index 8a1819f475..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/DataObject.java
+++ /dev/null
@@ -1,1105 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.List;
-
-/**
- * A data object is a representation of some structured data.
- * It is the fundamental component in the SDO (Service Data Objects) package.
- * Data objects support reflection, path-based accesss, convenience creation and deletion methods,
- * and the ability to be part of a {@link DataGraph data graph}.
- * <p>
- * Each data object holds its data as a series of {@link Property Properties}.
- * Properties can be accessed by name, property index, or using the property meta object itself.
- * A data object can also contain references to other data objects, through reference-type Properties.
- * <p>
- * A data object has a series of convenience accessors for its Properties.
- * These methods either use a path (String),
- * a property index,
- * or the {@link Property property's meta object} itself, to identify the property.
- * Some examples of the path-based accessors are as follows:
- *<pre>
- * DataObject company = ...;
- * company.get("name"); is the same as company.get(company.getType().getProperty("name"))
- * company.set("name", "acme");
- * company.get("department.0/name") is the same as ((DataObject)((List)company.get("department")).get(0)).get("name")
- * .n indexes from 0 ... implies the name property of the first department
- * company.get("department[1]/name") [] indexes from 1 ... implies the name property of the first department
- * company.get("department[number=123]") returns the first department where number=123
- * company.get("..") returns the containing data object
- * company.get("/") returns the root containing data object
- *</pre>
- * <p> There are general accessors for Properties, i.e., {@link #get(Property) get} and {@link #set(Property, Object) set},
- * as well as specific accessors for the primitive types and commonly used data types like
- * String, Date, List, BigInteger, and BigDecimal.
- */
-public interface DataObject extends Serializable
-{
- /**
- * Returns the value of a property of either this object or an object reachable from it, as identified by the
- * specified path.
- * @param path the path to a valid object and property.
- * @return the value of the specified property.
- * @see #get(Property)
- */
- Object get(String path);
-
- /**
- * Sets a property of either this object or an object reachable from it, as identified by the specified path,
- * to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void set(String path, Object value);
-
- /**
- * Returns whether a property of either this object or an object reachable from it, as identified by the specified path,
- * is considered to be set.
- * @param path the path to a valid object and property.
- * @see #isSet(Property)
- */
- boolean isSet(String path);
-
- /**
- * Unsets a property of either this object or an object reachable from it, as identified by the specified path.
- * @param path the path to a valid object and property.
- * @see #unset(Property)
- */
- void unset(String path);
-
- /**
- * Returns the value of a <code>boolean</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>boolean</code> value of the specified property.
- * @see #get(String)
- */
- boolean getBoolean(String path);
-
- /**
- * Returns the value of a <code>byte</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>byte</code> value of the specified property.
- * @see #get(String)
- */
- byte getByte(String path);
-
- /**
- * Returns the value of a <code>char</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>char</code> value of the specified property.
- * @see #get(String)
- */
- char getChar(String path);
-
- /**
- * Returns the value of a <code>double</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>double</code> value of the specified property.
- * @see #get(String)
- */
- double getDouble(String path);
-
- /**
- * Returns the value of a <code>float</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>float</code> value of the specified property.
- * @see #get(String)
- */
- float getFloat(String path);
-
- /**
- * Returns the value of a <code>int</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>int</code> value of the specified property.
- * @see #get(String)
- */
- int getInt(String path);
-
- /**
- * Returns the value of a <code>long</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>long</code> value of the specified property.
- * @see #get(String)
- */
- long getLong(String path);
-
- /**
- * Returns the value of a <code>short</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>short</code> value of the specified property.
- * @see #get(String)
- */
- short getShort(String path);
-
- /**
- * Returns the value of a <code>byte[]</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>byte[]</code> value of the specified property.
- * @see #get(String)
- */
- byte[] getBytes(String path);
-
- /**
- * Returns the value of a <code>BigDecimal</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>BigDecimal</code> value of the specified property.
- * @see #get(String)
- */
- BigDecimal getBigDecimal(String path);
-
- /**
- * Returns the value of a <code>BigInteger</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>BigInteger</code> value of the specified property.
- * @see #get(String)
- */
- BigInteger getBigInteger(String path);
-
- /**
- * Returns the value of a <code>DataObject</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>DataObject</code> value of the specified property.
- * @see #get(String)
- */
- DataObject getDataObject(String path);
-
- /**
- * Returns the value of a <code>Date</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>Date</code> value of the specified property.
- * @see #get(String)
- */
- Date getDate(String path);
-
- /**
- * Returns the value of a <code>String</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>String</code> value of the specified property.
- * @see #get(String)
- */
- String getString(String path);
-
- /**
- * Returns the value of a <code>List</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>List</code> value of the specified property.
- * @see #get(String)
- */
- List getList(String path);
-
- /**
- * Returns the value of a <code>Sequence</code> property identified by the specified path.
- * @param path the path to a valid object and property.
- * @return the <code>Sequence</code> value of the specified property.
- * @see #get(String)
- */
- Sequence getSequence(String path);
-
- /**
- * Sets the value of a <code>boolean</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setBoolean(String path, boolean value);
-
- /**
- * Sets the value of a <code>byte</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setByte(String path, byte value);
-
- /**
- * Sets the value of a <code>char</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setChar(String path, char value);
-
- /**
- * Sets the value of a <code>double</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setDouble(String path, double value);
-
- /**
- * Sets the value of a <code>float</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setFloat(String path, float value);
-
- /**
- * Sets the value of a <code>int</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setInt(String path, int value);
-
- /**
- * Sets the value of a <code>long</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setLong(String path, long value);
-
- /**
- * Sets the value of a <code>short</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setShort(String path, short value);
-
- /**
- * Sets the value of a <code>byte[]</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setBytes(String path, byte[] value);
-
- /**
- * Sets the value of a <code>BigDecimal</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setBigDecimal(String path, BigDecimal value);
-
- /**
- * Sets the value of a <code>BigInteger</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setBigInteger(String path, BigInteger value);
-
- /**
- * Sets the value of a <code>DataObject</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setDataObject(String path, DataObject value);
-
- /**
- * Sets the value of a <code>Date</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setDate(String path, Date value);
-
- /**
- * Sets the value of a <code>String</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- */
- void setString(String path, String value);
-
- /**
- * Sets the value of a <code>List</code> property identified by the specified path, to the specified value.
- * @param path the path to a valid object and property.
- * @param value the new value for the property.
- * @see #set(String, Object)
- * @see #setList(Property, List)
- */
- void setList(String path, List value);
-
- /**
- * Returns the value of the property at the specified index in {@link Type#getProperties property list}
- * of this object's {@link Type type}.
- * @param propertyIndex the index of the property.
- * @return the value of the specified property.
- * @see #get(Property)
- */
- Object get(int propertyIndex);
-
- /**
- * Sets the property at the specified index in {@link Type#getProperties property list} of this object's
- * {@link Type type}, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void set(int propertyIndex, Object value);
-
- /**
- * Returns whether the the property at the specified index in {@link Type#getProperties property list} of this object's
- * {@link Type type}, is considered to be set.
- * @param propertyIndex the index of the property.
- * @return whether the specified property is set.
- * @see #isSet(Property)
- */
- boolean isSet(int propertyIndex);
-
- /**
- * Unsets the property at the specified index in {@link Type#getProperties property list} of this object's {@link Type type}.
- * @param propertyIndex the index of the property.
- * @see #unset(Property)
- */
- void unset(int propertyIndex);
-
- /**
- * Returns the value of a <code>boolean</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>boolean</code> value of the specified property.
- * @see #get(int)
- */
- boolean getBoolean(int propertyIndex);
-
- /**
- * Returns the value of a <code>byte</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>byte</code> value of the specified property.
- * @see #get(int)
- */
- byte getByte(int propertyIndex);
-
- /**
- * Returns the value of a <code>char</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>char</code> value of the specified property.
- * @see #get(int)
- */
- char getChar(int propertyIndex);
-
- /**
- * Returns the value of a <code>double</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>double</code> value of the specified property.
- * @see #get(int)
- */
- double getDouble(int propertyIndex);
-
- /**
- * Returns the value of a <code>float</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>float</code> value of the specified property.
- * @see #get(int)
- */
- float getFloat(int propertyIndex);
-
- /**
- * Returns the value of a <code>int</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>int</code> value of the specified property.
- * @see #get(int)
- */
- int getInt(int propertyIndex);
-
- /**
- * Returns the value of a <code>long</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>long</code> value of the specified property.
- * @see #get(int)
- */
- long getLong(int propertyIndex);
-
- /**
- * Returns the value of a <code>short</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>short</code> value of the specified property.
- * @see #get(int)
- */
- short getShort(int propertyIndex);
-
- /**
- * Returns the value of a <code>byte[]</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>byte[]</code> value of the specified property.
- * @see #get(int)
- */
- byte[] getBytes(int propertyIndex);
-
- /**
- * Returns the value of a <code>BigDecimal</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>BigDecimal</code> value of the specified property.
- * @see #get(int)
- */
- BigDecimal getBigDecimal(int propertyIndex);
-
- /**
- * Returns the value of a <code>BigInteger</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>BigInteger</code> value of the specified property.
- * @see #get(int)
- */
- BigInteger getBigInteger(int propertyIndex);
-
- /**
- * Returns the value of a <code>DataObject</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>DataObject</code> value of the specified property.
- * @see #get(int)
- */
- DataObject getDataObject(int propertyIndex);
-
- /**
- * Returns the value of a <code>Date</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>Date</code> value of the specified property.
- * @see #get(int)
- */
- Date getDate(int propertyIndex);
-
- /**
- * Returns the value of a <code>String</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>String</code> value of the specified property.
- * @see #get(int)
- */
- String getString(int propertyIndex);
-
- /**
- * Returns the value of a <code>List</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>List</code> value of the specified property.
- * @see #get(int)
- */
- List getList(int propertyIndex);
-
- /**
- * Returns the value of a <code>Sequence</code> property identified by the specified property index.
- * @param propertyIndex the index of the property.
- * @return the <code>Sequence</code> value of the specified property.
- * @see #get(int)
- */
- Sequence getSequence(int propertyIndex);
-
- /**
- * Sets the value of a <code>boolean</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setBoolean(int propertyIndex, boolean value);
-
- /**
- * Sets the value of a <code>byte</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setByte(int propertyIndex, byte value);
-
- /**
- * Sets the value of a <code>char</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setChar(int propertyIndex, char value);
-
- /**
- * Sets the value of a <code>double</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setDouble(int propertyIndex, double value);
-
- /**
- * Sets the value of a <code>float</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setFloat(int propertyIndex, float value);
-
- /**
- * Sets the value of a <code>int</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setInt(int propertyIndex, int value);
-
- /**
- * Sets the value of a <code>long</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setLong(int propertyIndex, long value);
-
- /**
- * Sets the value of a <code>short</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setShort(int propertyIndex, short value);
-
- /**
- * Sets the value of a <code>byte[]</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setBytes(int propertyIndex, byte[] value);
-
- /**
- * Sets the value of a <code>BigDecimal</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setBigDecimal(int propertyIndex, BigDecimal value);
-
- /**
- * Sets the value of a <code>BigInteger</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setBigInteger(int propertyIndex, BigInteger value);
-
- /**
- * Sets the value of a <code>DataObject</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setDataObject(int propertyIndex, DataObject value);
-
- /**
- * Sets the value of a <code>Date</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setDate(int propertyIndex, Date value);
-
- /**
- * Sets the value of a <code>String</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- */
- void setString(int propertyIndex, String value);
-
- /**
- * Sets the value of a <code>List</code> property identified by the specified property index, to the specified value.
- * @param propertyIndex the index of the property.
- * @param value the new value for the property.
- * @see #set(int, Object)
- * @see #setList(Property, List)
- */
- void setList(int propertyIndex, List value);
-
- /**
- * Returns the value of the given property of this object.
- * <p>
- * If the property is {@link Property#isMany many-valued},
- * the result will be a {@link java.util.List}
- * and each object in the List will be {@link Type#isInstance an instance of}
- * the property's {@link Property#getType type}.
- * Otherwise the result will directly be an instance of the property's type.
- * @param property the property of the value to fetch.
- * @return the value of the given property of the object.
- * @see #set(Property, Object)
- * @see #unset(Property)
- * @see #isSet(Property)
- */
- Object get(Property property);
-
- /**
- * Sets the value of the given property of the object to the new value.
- * <p>
- * If the property is {@link Property#isMany many-valued},
- * the new value must be a {@link java.util.List}
- * and each object in that list must be {@link Type#isInstance an instance of}
- * the property's {@link Property#getType type};
- * the existing contents are cleared and the contents of the new value are added.
- * Otherwise the new value directly must be an instance of the property's type
- * and it becomes the new value of the property of the object.
- * @param property the property of the value to set.
- * @param value the new value for the property.
- * @see #unset(Property)
- * @see #isSet(Property)
- * @see #get(Property)
- */
- void set(Property property, Object value);
-
- /**
- * Returns whether the property of the object is considered to be set.
- * <p>
- * isSet() for many-valued Properties returns true if the List is not empty and
- * false if the List is empty. For single-valued Properties:
- * <ul><li>If the Property has not been set() or has been unset() then isSet() returns false.</li>
- * <li>If the current value is not the Property's default or null, isSet() returns true.</li>
- * <li>For the remaining cases the implementation may decide between two policies: </li>
- * <ol><li>any call to set() without a call to unset() will cause isSet() to return true, or </li>
- * <li>the current value is compared to the default value and isSet() returns true when they differ.</li>
- * </ol></ul><p>
- * @param property the property in question.
- * @return whether the property of the object is set.
- * @see #set(Property, Object)
- * @see #unset(Property)
- * @see #get(Property)
- */
- boolean isSet(Property property);
-
- /**
- * Unsets the property of the object.
- * <p>
- * If the property is {@link Property#isMany many-valued},
- * the value must be an {@link java.util.List}
- * and that list is cleared.
- * Otherwise,
- * the value of the property of the object
- * is set to the property's {@link Property#getDefault default value}.
- * The property will no longer be considered {@link #isSet set}.
- * @param property the property in question.
- * @see #isSet(Property)
- * @see #set(Property, Object)
- * @see #get(Property)
- */
- void unset(Property property);
-
- /**
- * Returns the value of the specified <code>boolean</code> property.
- * @param property the property to get.
- * @return the <code>boolean</code> value of the specified property.
- * @see #get(Property)
- */
- boolean getBoolean(Property property);
-
- /**
- * Returns the value of the specified <code>byte</code> property.
- * @param property the property to get.
- * @return the <code>byte</code> value of the specified property.
- * @see #get(Property)
- */
- byte getByte(Property property);
-
- /**
- * Returns the value of the specified <code>char</code> property.
- * @param property the property to get.
- * @return the <code>char</code> value of the specified property.
- * @see #get(Property)
- */
- char getChar(Property property);
-
- /**
- * Returns the value of the specified <code>double</code> property.
- * @param property the property to get.
- * @return the <code>double</code> value of the specified property.
- * @see #get(Property)
- */
- double getDouble(Property property);
-
- /**
- * Returns the value of the specified <code>float</code> property.
- * @param property the property to get.
- * @return the <code>float</code> value of the specified property.
- * @see #get(Property)
- */
- float getFloat(Property property);
-
- /**
- * Returns the value of the specified <code>int</code> property.
- * @param property the property to get.
- * @return the <code>int</code> value of the specified property.
- * @see #get(Property)
- */
- int getInt(Property property);
-
- /**
- * Returns the value of the specified <code>long</code> property.
- * @param property the property to get.
- * @return the <code>long</code> value of the specified property.
- * @see #get(Property)
- */
- long getLong(Property property);
-
- /**
- * Returns the value of the specified <code>short</code> property.
- * @param property the property to get.
- * @return the <code>short</code> value of the specified property.
- * @see #get(Property)
- */
- short getShort(Property property);
-
- /**
- * Returns the value of the specified <code>byte[]</code> property.
- * @param property the property to get.
- * @return the <code>byte[]</code> value of the specified property.
- * @see #get(Property)
- */
- byte[] getBytes(Property property);
-
- /**
- * Returns the value of the specified <code>BigDecimal</code> property.
- * @param property the property to get.
- * @return the <code>BigDecimal</code> value of the specified property.
- * @see #get(Property)
- */
- BigDecimal getBigDecimal(Property property);
-
- /**
- * Returns the value of the specified <code>BigInteger</code> property.
- * @param property the property to get.
- * @return the <code>BigInteger</code> value of the specified property.
- * @see #get(Property)
- */
- BigInteger getBigInteger(Property property);
-
- /**
- * Returns the value of the specified <code>DataObject</code> property.
- * @param property the property to get.
- * @return the <code>DataObject</code> value of the specified property.
- * @see #get(Property)
- */
- DataObject getDataObject(Property property);
-
- /**
- * Returns the value of the specified <code>Date</code> property.
- * @param property the property to get.
- * @return the <code>Date</code> value of the specified property.
- * @see #get(Property)
- */
- Date getDate(Property property);
-
- /**
- * Returns the value of the specified <code>String</code> property.
- * @param property the property to get.
- * @return the <code>String</code> value of the specified property.
- * @see #get(Property)
- */
- String getString(Property property);
-
- /**
- * Returns the value of the specified <code>List</code> property.
- * The List returned contains the current values.
- * Updates through the List interface operate on the current values of the DataObject.
- * Each access returns the same List object.
- * @param property the property to get.
- * @return the <code>List</code> value of the specified property.
- * @see #get(Property)
- */
- List getList(Property property);
-
- /**
- * Returns the value of the specified <code>Sequence</code> property.
- * @param property the property to get.
- * @return the <code>Sequence</code> value of the specified property.
- * @see #get(Property)
- */
- Sequence getSequence(Property property);
-
- /**
- * Sets the value of the specified <code>boolean</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setBoolean(Property property, boolean value);
-
- /**
- * Sets the value of the specified <code>byte</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setByte(Property property, byte value);
-
- /**
- * Sets the value of the specified <code>char</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setChar(Property property, char value);
-
- /**
- * Sets the value of the specified <code>double</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setDouble(Property property, double value);
-
- /**
- * Sets the value of the specified <code>float</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setFloat(Property property, float value);
-
- /**
- * Sets the value of the specified <code>int</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setInt(Property property, int value);
-
- /**
- * Sets the value of the specified <code>long</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setLong(Property property, long value);
-
- /**
- * Sets the value of the specified <code>short</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setShort(Property property, short value);
-
- /**
- * Sets the value of the specified <code>byte[]</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setBytes(Property property, byte[] value);
-
- /**
- * Sets the value of the specified <code>BigDecimal</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setBigDecimal(Property property, BigDecimal value);
-
- /**
- * Sets the value of the specified <code>BigInteger</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setBigInteger(Property property, BigInteger value);
-
- /**
- * Sets the value of the specified <code>DataObject</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setDataObject(Property property, DataObject value);
-
- /**
- * Sets the value of the specified <code>Date</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setDate(Property property, Date value);
-
- /**
- * Sets the value of the specified <code>String</code> property, to the specified value.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setString(Property property, String value);
-
- /**
- * Sets the value of the specified <code>List</code> property, to the specified value.
- * <p> The new value must be a {@link java.util.List}
- * and each object in that list must be {@link Type#isInstance an instance of}
- * the property's {@link Property#getType type};
- * the existing contents are cleared and the contents of the new value are added.
- * @param property the property to set.
- * @param value the new value for the property.
- * @see #set(Property, Object)
- */
- void setList(Property property, List value);
-
- /**
- * Returns a new {@link DataObject data object} contained by this object using the specified property,
- * which must be a {@link Property#isContainment containment property}.
- * The type of the created object is the {@link Property#getType declared type} of the specified property.
- * @param propertyName the name of the specified containment property.
- * @return the created data object.
- * @see #createDataObject(String, String, String)
- */
- DataObject createDataObject(String propertyName);
-
- /**
- * Returns a new {@link DataObject data object} contained by this object using the specified property,
- * which must be a {@link Property#isContainment containment property}.
- * The type of the created object is the {@link Property#getType declared type} of the specified property.
- * @param propertyIndex the index of the specified containment property.
- * @return the created data object.
- * @see #createDataObject(int, String, String)
- */
- DataObject createDataObject(int propertyIndex);
-
- /**
- * Returns a new {@link DataObject data object} contained by this object using the specified property,
- * which must be a {@link Property#isContainment containment property}.
- * The type of the created object is the {@link Property#getType declared type} of the specified property.
- * @param property the specified containment property.
- * @return the created data object.
- * @see #createDataObject(Property, Type)
- */
- DataObject createDataObject(Property property);
-
- /**
- * Returns a new {@link DataObject data object} contained by this object using the specified property,
- * which must be a {@link Property#isContainment containment property}.
- * The type of the created object is specified by the packageURI and typeName arguments.
- * The specified type must be a compatible target for the property identified by propertyName.
- * @param propertyName the name of the specified containment property.
- * @param namespaceURI the namespace URI of the package containing the type of object to be created.
- * @param typeName the name of a type in the specified package.
- * @return the created data object.
- * @see #createDataObject(String)
- * @see DataGraph#getType
- */
- DataObject createDataObject(String propertyName, String namespaceURI, String typeName);
-
- /**
- * Returns a new {@link DataObject data object} contained by this object using the specified property,
- * which must be a {@link Property#isContainment containment property}.
- * The type of the created object is specified by the packageURI and typeName arguments.
- * The specified type must be a compatible target for the property identified by propertyIndex.
- * @param propertyIndex the index of the specified containment property.
- * @param namespaceURI the namespace URI of the package containing the type of object to be created.
- * @param typeName the name of a type in the specified package.
- * @return the created data object.
- * @see #createDataObject(int)
- * @see DataGraph#getType
- */
- DataObject createDataObject(int propertyIndex, String namespaceURI, String typeName);
-
- /**
- * Returns a new {@link DataObject data object} contained by this object using the specified property,
- * which must be of {@link Property#isContainment containment type}.
- * The type of the created object is specified by the type argument,
- * which must be a compatible target for the speicifed property.
- * @param property a containment property of this object.
- * @param type the type of object to be created.
- * @return the created data object.
- * @see #createDataObject(int)
- */
- DataObject createDataObject(Property property, Type type);
-
- /**
- * Remove this object from its container and then unset all its non-{@link Property#isReadOnly readOnly} Properties.
- * If this object is contained by a {@link Property#isReadOnly readOnly} {@link Property#isContainment containment property}, its non-{@link Property#isReadOnly readOnly} Properties will be unset but the object will not be removed from its container.
- * All DataObjects recursively contained by {@link Property#isContainment containment Properties} will also be deleted.
- */
- void delete();
-
- /**
- * Returns the containing {@link DataObject data object}
- * or <code>null</code> if there is no container.
- * @return the containing data object or <code>null</code>.
- */
- DataObject getContainer();
-
- /**
- * Return the Property of the {@link DataObject data object} containing this data object
- * or <code>null</code> if there is no container.
- * @return the property containing this data object.
- */
- Property getContainmentProperty();
-
- /**
- * Returns the {@link DataGraph data graph} for this object or <code>null</code> if there isn't one.
- * @return the containing data graph or <code>null</code>.
- */
- DataGraph getDataGraph();
-
- /**
- * Returns the data object's type.
- * <p>
- * The type defines the Properties available for reflective access.
- * @return the type.
- */
- Type getType();
-
- /**
- * Returns the <code>Sequence</code> for this DataObject.
- * When getType().isSequencedType() == true,
- * the Sequence of a DataObject corresponds to the
- * XML elements representing the values of its Properties.
- * Updates through DataObject and the Lists or Sequences returned
- * from DataObject operate on the same data.
- * When getType().isSequencedType() == false, null is returned.
- * @return the <code>Sequence</code> or null.
- */
- Sequence getSequence();
-
- /**
- * Returns a read-only List of the Properties currently used in this DataObject.
- * This list will contain all of the Properties in getType().getProperties()
- * and any Properties where isSet(property) is true.
- * For example, Properties resulting from the use of
- * open or mixed XML content are present if allowed by the Type.
- * the List does not contain duplicates.
- * The order of the Properties in the List begins with getType().getProperties()
- * and the order of the remaining Properties is determined by the implementation.
- * The same list will be returned unless the DataObject is updated so that
- * the contents of the List change.
- * @return the List of Properties currently used in this DataObject.
- */
- List /* Property */ getInstanceProperties();
-
- /**
- * Returns the named Property from the current instance properties,
- * or null if not found. The instance properties are getInstanceProperties().
- * @param propertyName the name of the Property
- * @return the named Property from the DataObject's current instance properties, or null.
- */
- Property getProperty(String propertyName);
-
- /**
- * Returns the root {@link DataObject data object}.
- * @return the root data object.
- */
- DataObject getRootObject();
-
- /**
- * Returns the ChangeSummary with scope covering this dataObject, or null
- * if there is no ChangeSummary.
- * @return the ChangeSummary with scope covering this dataObject, or null.
- */
- ChangeSummary getChangeSummary();
-
- /**
- * Removes this DataObject from its container, if any.
- * Same as
- * getContainer().getList(getContainmentProperty()).remove(this) or
- * getContainer().unset(getContainmentProperty())
- * depending on getContainmentProperty().isMany() respectively.
- */
- void detach();
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Property.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Property.java
deleted file mode 100644
index cc96e90b44..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Property.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo;
-
-import java.util.List;
-
-/**
- * A representation of a Property in the {@link Type type} of a {@link DataObject data object}.
- */
-public interface Property
-{
- /**
- * Returns the name of the Property.
- * @return the Property name.
- */
- String getName();
-
- /**
- * Returns the type of the Property.
- * @return the Property type.
- */
- Type getType();
-
- /**
- * Returns whether the Property is many-valued.
- * @return <code>true</code> if the Property is many-valued.
- */
- boolean isMany();
-
- /**
- * Returns whether the Property is containment, i.e., whether it represents by-value composition.
- * @return <code>true</code> if the Property is containment.
- */
- boolean isContainment();
-
- /**
- * Returns the containing type of this Property.
- * @return the Property's containing type.
- * @see Type#getProperties()
- */
- Type getContainingType();
-
- /**
- * Returns the default value this Property will have in a {@link DataObject data object} where the Property hasn't been set.
- * @return the default value.
- */
- Object getDefault();
-
- /**
- * Returns true if values for this Property cannot be modified using the SDO APIs.
- * When true, DataObject.set(Property property, Object value) throws an exception.
- * Values may change due to other factors, such as services operating on DataObjects.
- * @return true if values for this Property cannot be modified.
- */
- boolean isReadOnly();
-
- /**
- * Returns the opposite Property if the Property is bi-directional or null otherwise.
- * @return the opposite Property if the Property is bi-directional or null
- */
- Property getOpposite();
-
- /**
- * Return a list of alias names for this Property.
- * @return a list of alias names for this Property.
- */
- List /*String*/ getAliasNames();
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Sequence.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Sequence.java
deleted file mode 100644
index b46a5be7e0..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Sequence.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo;
-
-/**
- * A sequence is a heterogeneous list of {@link Property properties} and corresponding values.
- * It represents an ordered arbitrary mixture of data values from more than one property of a {@link DataObject data object}.
- */
-public interface Sequence
-{
- /**
- * Returns the number of entries in the sequence.
- * @return the number of entries.
- */
- int size();
-
- /**
- * Returns the property for the given entry index.
- * Returns <code>null</code> for mixed text entries.
- * @param index the index of the entry.
- * @return the property or <code>null</code> for the given entry index.
- */
- Property getProperty(int index);
-
- /**
- * Returns the property value for the given entry index.
- * @param index the index of the entry.
- * @return the value for the given entry index.
- */
- Object getValue(int index);
-
- /**
- * Sets the entry at a specified index to the new value.
- * @param index the index of the entry.
- * @param value the new value for the entry.
- */
- Object setValue(int index, Object value);
-
- /**
- * Adds a new entry with the specified property name and value
- * to the end of the entries.
- * @param propertyName the name of the entry's property.
- * @param value the value for the entry.
- */
- boolean add(String propertyName, Object value);
-
- /**
- * Adds a new entry with the specified property index and value
- * to the end of the entries.
- * @param propertyIndex the index of the entry's property.
- * @param value the value for the entry.
- */
- boolean add(int propertyIndex, Object value);
-
- /**
- * Adds a new entry with the specified property and value
- * to the end of the entries.
- * @param property the property of the entry.
- * @param value the value for the entry.
- */
- boolean add(Property property, Object value);
-
- /**
- * Adds a new entry with the specified property name and value
- * at the specified entry index.
- * @param index the index at which to add the entry.
- * @param propertyName the name of the entry's property.
- * @param value the value for the entry.
- */
- void add(int index, String propertyName, Object value);
-
- /**
- * Adds a new entry with the specified property index and value
- * at the specified entry index.
- * @param index the index at which to add the entry.
- * @param propertyIndex the index of the entry's property.
- * @param value the value for the entry.
- */
- void add(int index, int propertyIndex, Object value);
-
- /**
- * Adds a new entry with the specified property and value
- * at the specified entry index.
- * @param index the index at which to add the entry.
- * @param property the property of the entry.
- * @param value the value for the entry.
- */
- void add(int index, Property property, Object value);
-
- /**
- * Removes the entry at the given entry index.
- * @param index the index of the entry.
- */
- void remove(int index);
-
- /**
- * Moves the entry at <code>fromIndex</code> to <code>toIndex</code>.
- * @param toIndex the index of the entry destination.
- * @param fromIndex the index of the entry to move.
- */
- void move(int toIndex, int fromIndex);
-
- /**
- * Adds a new entry with the SDO text Property
- * to the end of the Sequence.
- * Same as add(property, text) where property is the SDO text Property.
- * @param text value of the entry.
- */
- void add(String text);
-
- /**
- * Adds a new entry with the SDO text Property
- * at the given index.
- * Same as add(index, property, text) where property is the SDO text Property.
- * @param index the index at which to add the entry.
- * @param text value of the entry.
- */
- void add(int index, String text);
-
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Type.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Type.java
deleted file mode 100644
index 85d43aad60..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/Type.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo;
-
-import java.util.List;
-
-/**
- * A representation of the type of a {@link Property property} of a {@link DataObject data object}.
- */
-public interface Type
-{
- /**
- * Returns the name of the type.
- * @return the type name.
- */
- String getName();
-
- /**
- * Returns the namespace URI of the type.
- * @return the namespace URI.
- */
- String getURI();
-
- /**
- * Returns the Java class that this type represents.
- * @return the Java class.
- */
- Class getInstanceClass();
-
- /**
- * Returns whether the specified object is an instance of this type.
- * @param object the object in question.
- * @return <code>true</code> if the object is an instance.
- * @see Class#isInstance
- */
- boolean isInstance(Object object);
-
- /**
- * Returns the List of the {@link Property Properties} of this type.
- * <p>
- * The expression
- *<pre>
- * type.getProperties().indexOf(property)
- *</pre>
- * yields the property's index relative to this type.
- * As such, these expressions are equivalent:
- *<pre>
- * dataObject.{@link DataObject#get(int) get}(i)
- * dataObject.{@link DataObject#get(Property) get}((Property)dataObject.getType().getProperties().get(i));
- *</pre>
- * </p>
- * @return the Properties of the type.
- * @see Property#getContainingType
- */
- List /*Property*/ getProperties();
-
- /**
- * Returns from {@link #getProperties all the Properties} of this type, the one with the specified name.
- * As such, these expressions are equivalent:
- *<pre>
- * dataObject.{@link DataObject#get(String) get}("name")
- * dataObject.{@link DataObject#get(Property) get}(dataObject.getType().getProperty("name"))
- *</pre>
- * </p>
- * @return the Property with the specified name.
- * @see #getProperties
- */
- Property getProperty(String propertyName);
-
- /**
- * Indicates if this Type specifies DataTypes (true) or DataObjects (false).
- * When false, any object that is an instance of this type
- * also implements the DataObject interface.
- * True for simple types such as Strings and numbers.
- * For any object:
- * <pre>
- * isInstance(object) && !isDataType() implies
- * DataObject.class.isInstance(object) returns true.
- * </pre>
- * @return true if Type specifies DataTypes, false for DataObjects.
- */
- boolean isDataType();
-
- /**
- * Indicates if this Type allows any form of open content. If false,
- * dataObject.getInstanceProperties() must be the same as
- * dataObject.getType().getProperties() for any DataObject dataObject of this Type.
- * @return true if this Type allows open content.
- */
- boolean isOpen();
-
- /**
- * Indicates if this Type specifies Sequenced DataObjects.
- * Sequenced DataObjects are used when the order of values
- * between Properties must be preserved.
- * When true, a DataObject will return a Sequence. For example,
- * <pre>
- * Sequence elements = dataObject.{@link DataObject#getSequence() getSequence}();
- * </pre>
- * @return true if this Type specifies Sequenced DataObjects.
- */
- boolean isSequenced();
-
- /**
- * Indicates if this Type is abstract. If true, this Type cannot be
- * instantiated. Abstract types cannot be used in DataObject or
- * DataFactory create methods.
- * @return true if this Type is abstract.
- */
- boolean isAbstract();
-
- /**
- * Returns the List of base Types for this Type. The List is empty
- * if there are no base Types. XSD <extension>, <restriction>, and
- * Java extends keyword are mapped to this list.
- * @return the List of base Types for this Type.
- */
- List /*Type*/ getBaseTypes();
-
- /**
- * Returns the Properties declared in this Type as opposed to
- * those declared in base Types.
- * @return the Properties declared in this Type.
- */
- List /*Property*/ getDeclaredProperties();
-
- /**
- * Return a list of alias names for this Type.
- * @return a list of alias names for this Type.
- */
- List /*String*/ getAliasNames();
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/CopyHelper.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/CopyHelper.java
deleted file mode 100644
index f0bf98aada..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/CopyHelper.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo.helper;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * A helper for copying DataObjects.
- */
-public interface CopyHelper
-{
- /**
- * Create a shallow copy of the DataObject dataObject:
- * Creates a new DataObject copiedDataObject with the same values
- * as the source dataObject for each property where
- * property.getType().isDataType() is true.
- * The value of such a Property property in copiedDataObject is:
- * dataObject.get(property) for single-valued Properties
- * (copiedDataObject.get(property) equals() dataObject.get(property)), or
- * a List where each member is equal to the member at the
- * same index in dataObject for multi-valued Properties
- * copiedDataObject.getList(property).get(i) equals() dataObject.getList(property).get(i)
- * The copied Object is unset for each Property where
- * property.getType().isDataType() is false
- * since they are not copied.
- * Read-only properties are copied.
- * A copied object shares metadata with the source object
- * sourceDO.getType() == copiedDO.getType()
- * If a ChangeSummary is part of the source DataObject
- * the copy has a new, empty ChangeSummary.
- * Logging state is the same as the source ChangeSummary.
- *
- * @param dataObject to be copied
- * @return copy of dataObject
- */
- DataObject copyShallow(DataObject dataObject);
-
- /**
- * Create a deep copy of the DataObject tree:
- * Copies the dataObject and all its {@link commonj.sdo.Property#isContainment() contained}
- * DataObjects recursively.
- * Values of Properties are copied as in shallow copy,
- * and values of Properties where
- * property.getType().isDataType() is false
- * are copied where each value copied must be a
- * DataObject contained by the source dataObject.
- * If a DataObject is outside the DataObject tree and the
- * property is bidirectional, then the DataObject is skipped.
- * If a DataObject is outside the DataObject tree and the
- * property is unidirectional, then the same DataObject is referenced.
- * Read-only properties are copied.
- * If any DataObject referenced is not in the containment
- * tree an IllegalArgumentException is thrown.
- * If a ChangeSummary is part of the copy tree the new
- * ChangeSummary refers to objects in the new DataObject tree.
- * Logging state is the same as the source ChangeSummary.
- *
- * @param dataObject to be copied.
- * @return copy of dataObject
- * @throws IllegalArgumentException if any referenced DataObject
- * is not part of the containment tree.
- */
- DataObject copy(DataObject dataObject);
-
- /**
- * The default CopyHelper.
- */
- CopyHelper INSTANCE = HelperProvider.getCopyHelper();
-
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/DataFactory.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/DataFactory.java
deleted file mode 100644
index fc9bf96ba4..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/DataFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo.helper;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * A Factory for creating DataObjects.
- * The created DataObjects are not connected to any other DataObjects.
- */
-public interface DataFactory
-{
- /**
- * Create a DataObject of the Type specified by typeName with the given package uri.
- * @param uri The uri of the Type.
- * @param typeName The name of the Type.
- * @return the created DataObject.
- * @throws IllegalArgumentException if the uri and typeName does
- * not correspond to a Type this factory can instantiate.
- */
- DataObject create(String uri, String typeName);
-
- /**
- * Create a DataObject supporting the given interface.
- * InterfaceClass is the interface for the DataObject's Type.
- * The DataObject created is an instance of the interfaceClass.
- * @param interfaceClass is the interface for the DataObject's Type.
- * @return the created DataObject.
- * @throws IllegalArgumentException if the instanceClass does
- * not correspond to a Type this factory can instantiate.
- */
- DataObject create(Class interfaceClass);
-
- /**
- * Create a DataObject of the Type specified.
- * @param type The Type.
- * @return the created DataObject.
- * @throws IllegalArgumentException if the Type
- * cannot be instantiaed by this factory.
- */
- DataObject create(Type type);
-
- /**
- * The default DataFactory.
- */
- DataFactory INSTANCE = HelperProvider.getDataFactory();
-
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/DataHelper.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/DataHelper.java
deleted file mode 100644
index 1a630e4118..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/DataHelper.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo.helper;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * Data helper methods.
- */
-public interface DataHelper
-{
- /**
- * Convert from a String representation of an SDO date type to a Date.
- * @param dateString the String representation of an SDO date type
- * @return a Date representation of an SDO date type.
- * @throws IllegalArgumentException for invalid formats.
- */
- Date toDate(String dateString);
-
- /**
- * Convert from a String representation of an SDO date type to a Calendar using the
- * default locale. Same as toCalendar(dateString, null).
- * @param dateString the String representation of an SDO date type
- * @return a Calendar representation of an SDO date type.
- * @throws IllegalArgumentException for invalid formats.
- */
- Calendar toCalendar(String dateString);
-
- /**
- * Convert from a String representation of an SDO date type to a Calendar using the
- * specified locale, or the default locale if the locale is null.
- * @param dateString the String representation of an SDO date type
- * @param locale the locale or null for default locale.
- * @return a Calendar representation of an SDO date type.
- * @throws IllegalArgumentException for invalid formats.
- */
- Calendar toCalendar(String dateString, Locale locale);
-
- /**
- * Convert from a Date to a String representation of the DateTime type.
- * @param date the date
- * @return a Date to a String representation of the DateTime type.
- */
- String toDateTime(Date date);
-
- /**
- * Convert from a Date to a String representation of the Duration type.
- * @param date the date
- * @return a Date to a String representation of the Duration type.
- */
- String toDuration(Date date);
-
- /**
- * Convert from a Date to a String representation of the Time type.
- * @param date the date
- * @return a Date to a String representation of the Time type.
- */
- String toTime(Date date);
-
- /**
- * Convert from a Date to a String representation of the Day type.
- * @param date the date
- * @return a Date to a String representation of the Day type.
- */
- String toDay(Date date);
-
- /**
- * Convert from a Date to a String representation of the Month type.
- * @param date the date
- * @return a Date to a String representation of the Month type.
- */
- String toMonth(Date date);
-
- /**
- * Convert from a Date to a String representation of the MonthDay type.
- * @param date the date
- * @return a Date to a String representation of the MonthDay type.
- */
- String toMonthDay(Date date);
-
- /**
- * Convert from a Date to a String representation of the Year type.
- * @param date the date
- * @return a Date to a String representation of the Year type.
- */
- String toYear(Date date);
-
- /**
- * Convert from a Date to a String representation of the YearMonth type.
- * @param date the date
- * @return a Date to a String representation of the YearMonth type.
- */
- String toYearMonth(Date date);
-
- /**
- * Convert from a Date to a String representation of the YearMonthDay type.
- * @param date the date
- * @return a Date to a String representation of the YearMonthDay type.
- */
- String toYearMonthDay(Date date);
-
- /**
- * Convert from a Calendar to a String representation of the DateTime type.
- * @param calendar the calendar to convert
- * @return a Calendar to a String representation of the DateTime type.
- */
- String toDateTime(Calendar calendar);
-
- /**
- * Convert from a Calendar to a String representation of the Duration type.
- * @param calendar the calendar to convert
- * @return a Calendar to a String representation of the Duration type.
- */
- String toDuration(Calendar calendar);
-
- /**
- * Convert from a Calendar to a String representation of the Time type.
- * @param calendar the calendar to convert
- * @return a Calendar to a String representation of the Time type.
- */
- String toTime(Calendar calendar);
-
- /**
- * Convert from a Calendar to a String representation of the Day type.
- * @param calendar the calendar to convert
- * @return a Calendar to a String representation of the Day type.
- */
- String toDay(Calendar calendar);
-
- /**
- * Convert from a Calendar to a String representation of the Month type.
- * @param calendar the calendar to convert
- * @return a Calendar to a String representation of the Month type.
- */
- String toMonth(Calendar calendar);
-
- /**
- * Convert from a Calendar to a String representation of the MonthDay type.
- * @param calendar the calendar to convert
- * @return a Calendar to a String representation of the MonthDay type.
- */
- String toMonthDay(Calendar calendar);
-
- /**
- * Convert from a Calendar to a String representation of the Year type.
- * @param calendar the calendar to convert
- * @return a Calendar to a String representation of the Year type.
- */
- String toYear(Calendar calendar);
-
- /**
- * Convert from a Calendar to a String representation of the YearMonth type.
- * @param calendar the calendar to convert
- * @return a Calendar to a String representation of the YearMonth type.
- */
- String toYearMonth(Calendar calendar);
-
- /**
- * Convert from a Calendar to a String representation of the YearMonthDay type.
- * @param calendar the calendar to convert
- * @return a Calendar to a String representation of the YearMonthDay type.
- */
- String toYearMonthDay(Calendar calendar);
-
- /**
- * The default TypeHelper.
- */
- DataHelper INSTANCE = HelperProvider.getDataHelper();
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/EqualityHelper.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/EqualityHelper.java
deleted file mode 100644
index 6214020701..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/EqualityHelper.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo.helper;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * A helper for comparing DataObjects.
- */
-public interface EqualityHelper
-{
- /**
- * <p>Two DataObjects are equalShallow if
- * they have the same {@link DataObject#getType Type}
- * and all their compared Properties are equal.
- * The set of Properties compared are the
- * {@link DataObject#getInstanceProperties() instance properties}
- * where property.getType().isDataType() is true
- * and property.getType() is not ChangeSummaryType.
- * <br/>Two of these Property values are equal if they are both not
- * {@link DataObject#isSet(Property) set}, or set to an equal value
- * dataObject1.get(property).equals(dataObject2.get(property))
- * <br/>If the type is a sequenced type, the sequence entries must be the same.
- * For each entry x in the sequence where the property is used in the comparison,
- * dataObject1.getSequence().getValue(x).equals(
- * dataObject2.getSequence().getValue(x)) and
- * dataObject1.getSequence().getProperty(x) ==
- * dataObject2.getSequence().getProperty(x)
- * must be true.
- * </p>
- * Returns true the objects have the same Type and all values of all compared Properties are equal.
- * @param dataObject1 DataObject to be compared
- * @param dataObject2 DataObject to be compared
- * @return true the objects have the same Type and all values of all compared Properties are equal.
- */
- boolean equalShallow(DataObject dataObject1, DataObject dataObject2);
-
- /**
- * <p>Two DataObjects are equal(Deep) if they are equalShallow,
- * all their compared Properties are equal, and all reachable DataObjects in their
- * graphs excluding containers are equal.
- * The set of Properties compared are the
- * {@link DataObject#getInstanceProperties() instance properties}
- * where property.getType().isDataType() is false,
- * and is not a container property, ie !property.getOpposite().isContainment()
- * <br/>Two of these Property values are equal if they are both not
- * {@link DataObject#isSet(Property) set}, or all the DataObjects
- * they refer to are {@link #equal(DataObject, DataObject) equal} in the
- * context of dataObject1 and dataObject2.
- * <br/>Note that properties to a containing DataObject are not compared
- * which means two DataObject trees can be equal even if their containers are not equal.
- * <br/>If the type is a sequenced type, the sequence entries must be the same.
- * For each entry x in the sequence where the property is used in the comparison,
- * equal(dataObject1.getSequence().getValue(x),
- * dataObject2.getSequence().getValue(x)) and
- * dataObject1.getSequence().getProperty(x) ==
- * dataObject2.getSequence().getProperty(x)
- * must be true.
- * </p><p>
- * A DataObject directly or indirectly referenced by dataObject1 or dataObject2
- * can only be equal to exactly one DataObject directly or indirectly referenced
- * by dataObject1 or dataObject2, respectively.
- * This ensures that dataObject1 and dataObject2 are equal if the graph formed by
- * all their referenced DataObjects have the same shape.
- * </p>
- * Returns true if the trees of DataObjects are equal(Deep).
- * @param dataObject1 DataObject to be compared
- * @param dataObject2 DataObject to be compared
- * @return true if the trees of DataObjects are equal(Deep).
- */
- boolean equal(DataObject dataObject1, DataObject dataObject2);
-
- /**
- * The default EqualityHelper.
- */
- EqualityHelper INSTANCE = HelperProvider.getEqualityHelper();
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/TypeHelper.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/TypeHelper.java
deleted file mode 100644
index 13f013ed50..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/TypeHelper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo.helper;
-
-import java.util.List;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * Look up a Type given the uri and typeName or interfaceClass.
- * SDO Types are available through the
- * getType("commonj.sdo", typeName) method.
- * Defines Types from DataObjects.
- */
-public interface TypeHelper
-{
- /**
- * Return the Type specified by typeName with the given uri,
- * or null if not found.
- * @param uri The uri of the Type - type.getURI();
- * @param typeName The name of the Type - type.getName();
- * @return the Type specified by typeName with the given uri,
- * or null if not found.
- */
- Type getType(String uri, String typeName);
-
- /**
- * Return the Type for this interfaceClass or null if not found.
- * @param interfaceClass is the interface for the DataObject's Type -
- * type.getInstanceClass();
- * @return the Type for this interfaceClass or null if not found.
- */
- Type getType(Class interfaceClass);
-
- /**
- * Define the DataObject as a Type.
- * The Type is available through TypeHelper and DataGraph getType() methods.
- * @param type the DataObject representing the Type.
- * @return the defined Type.
- * @throws IllegalArgumentException if the Type could not be defined.
- */
- Type define(DataObject type);
-
- /**
- * Define the list of DataObjects as Types.
- * The Types are available through TypeHelper and DataGraph getType() methods.
- * @param types a List of DataObjects representing the Types.
- * @return the defined Types.
- * @throws IllegalArgumentException if the Types could not be defined.
- */
- List /*Type*/ define(List /*DataObject*/ types);
-
- /**
- * The default TypeHelper.
- */
- TypeHelper INSTANCE = HelperProvider.getTypeHelper();
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XMLDocument.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XMLDocument.java
deleted file mode 100644
index 3ef7fd70c8..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XMLDocument.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo.helper;
-
-import commonj.sdo.DataObject;
-
-/**
- * Represents an XML Document containing a tree of DataObjects.
- *
- * An example XMLDocument fragment is:
- * <?xml version="1.0"?>
- * <purchaseOrder orderDate="1999-10-20">
- *
- * created from this XML Schema fragment:
- * <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- * <xsd:element name="purchaseOrder" type="PurchaseOrderType"/>
- * <xsd:complexType name="PurchaseOrderType">
- *
- * Upon loading this XMLDocument:
- * DataObject is an instance of Type PurchaseOrderType.
- * RootElementURI is null because the XSD has no targetNamespace URI.
- * RootElementName is purchaseOrder.
- * Encoding is null because the document did not specify an encoding.
- * XMLDeclaration is true because the document contained an XML declaration.
- * XMLVersion is 1.0
- * SchemaLocation and noNamespaceSchemaLocation are null because they are
- * not specified in the document.
- *
- * When saving the root element, if the type of the root dataObject is not the
- * type of global element specified by rootElementURI and rootElementName,
- * or if a global element does not exist for rootElementURI and rootElementName,
- * then an xsi:type declaration is written to record the root DataObject's Type.
- *
- * When loading the root element and an xsi:type declaration is found
- * it is used as the type of the root DataObject. In this case,
- * if validation is not being performed, it is not an error if the
- * rootElementName is not a global element.
- */
-public interface XMLDocument
-{
- /**
- * Return the root DataObject for the XMLDocument.
- * @return root DataObject for the XMLDocument.
- */
- DataObject getRootObject();
-
- /**
- * Return the targetNamespace URI for the root element.
- * If there is no targetNamespace URI, the value is null.
- * The root element is a global element of the XML Schema
- * with a type compatible to the DataObject.
- * @return the targetNamespace URI for the root element.
- */
- String getRootElementURI();
-
- /**
- * Return the name of the root element.
- * The root element is a global element of the XML Schema
- * with a type compatible to the DataObject.
- * @return the name of the root element.
- */
- String getRootElementName();
-
- /**
- * Return the XML encoding of the document, or null if not specified.
- * The default value is "UTF-8".
- * Specification of other values is implementation-dependent.
- * @return the XML encoding of the document, or null if not specified.
- */
- String getEncoding();
-
- /**
- * Set the XML encoding of the document, or null if not specified.
- * @param encoding
- */
- void setEncoding(String encoding);
-
- /**
- * Return the XML declaration of the document. If true,
- * XMLHelper save() will produce a declaration of the form:
- * <?xml version="1.0" encoding="UTF-8"?>
- * Encoding will be suppressed if getEncoding() is null.
- * The default value is true.
- * @return the XML declaration of the document.
- */
- boolean isXMLDeclaration();
-
- /**
- * Set the XML declaration version of the document.
- * @param xmlDeclaration the XML declaration version of the document.
- */
- void setXMLDeclaration(boolean xmlDeclaration);
-
- /**
- * Return the XML version of the document, or null if not specified.
- * The default value is "1.0".
- * Specification of other values is implementation-dependent.
- * @return the XML version of the document, or null if not specified.
- */
- String getXMLVersion();
-
- /**
- * Set the XML version of the document, or null if not specified.
- * @param xmlVersion the XML version of the document, or null if not specified.
- */
- void setXMLVersion(String xmlVersion);
-
- /**
- * Return the value of the schemaLocation declaration
- * for the http://www.w3.org/2001/XMLSchema-instance namespace in the
- * root element, or null if not present.
- * @return the value of the schemaLocation declaration,
- * or null if not present.
- */
- String getSchemaLocation();
-
- /**
- * Sets the value of the schemaLocation declaration
- * for the http://www.w3.org/2001/XMLSchema-instance namespace in the
- * root element, or null if it should not be present.
- * @param schemaLocation the value of the schemaLocation declaration, or null.
- */
- void setSchemaLocation(String schemaLocation);
-
- /**
- * Return the value of the noNamespaceSchemaLocation declaration
- * for the http://www.w3.org/2001/XMLSchema-instance namespace in the
- * root element, or null if not present.
- * @return the value of the noNamespaceSchemaLocation declaration,
- * or null if not present.
- */
- String getNoNamespaceSchemaLocation();
-
- /**
- * Sets the value of the noNamespaceSchemaLocation declaration
- * for the http://www.w3.org/2001/XMLSchema-instance namespace in the
- * root element, or null if it should not be present.
- * @param schemaLocation the value of the noNamespaceSchemaLocation declaration, or null.
- */
- void setNoNamespaceSchemaLocation(String schemaLocation);
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XMLHelper.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XMLHelper.java
deleted file mode 100644
index 1d0c6ca127..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XMLHelper.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo.helper;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * A helper to convert XML documents into DataObects and
- * DataObjects into XML documnets.
- */
-public interface XMLHelper
-{
- /**
- * Creates and returns an XMLDocument from the input String.
- * By default does not perform XSD validation.
- * Same as
- * load(new StringReader(inputString), null, null);
- *
- * @param inputString specifies the String to read from
- * @return the new XMLDocument loaded
- * @throws RuntimeException for errors in XML parsing or
- * implementation-specific validation.
- */
- XMLDocument load(String inputString);
-
- /**
- * Creates and returns an XMLDocument from the inputStream.
- * The InputStream will be closed after reading.
- * By default does not perform XSD validation.
- * Same as
- * load(inputStream, null, null);
- *
- * @param inputStream specifies the InputStream to read from
- * @return the new XMLDocument loaded
- * @throws IOException for stream exceptions.
- * @throws RuntimeException for errors in XML parsing or
- * implementation-specific validation.
- */
- XMLDocument load(InputStream inputStream) throws IOException;
-
- /**
- * Creates and returns an XMLDocument from the inputStream.
- * The InputStream will be closed after reading.
- * By default does not perform XSD validation.
- * @param inputStream specifies the InputStream to read from
- * @param locationURI specifies the URI of the document for relative schema locations
- * @param options implementation-specific options.
- * @return the new XMLDocument loaded
- * @throws IOException for stream exceptions.
- * @throws RuntimeException for errors in XML parsing or
- * implementation-specific validation.
- */
- XMLDocument load(InputStream inputStream, String locationURI, Object options) throws IOException;
-
- /**
- * Creates and returns an XMLDocument from the inputReader.
- * The InputStream will be closed after reading.
- * By default does not perform XSD validation.
- * @param inputReader specifies the Reader to read from
- * @param locationURI specifies the URI of the document for relative schema locations
- * @param options implementation-specific options.
- * @return the new XMLDocument loaded
- * @throws IOException for stream exceptions.
- * @throws RuntimeException for errors in XML parsing or
- * implementation-specific validation.
- */
- XMLDocument load(Reader inputReader, String locationURI, Object options) throws IOException;
-
- /**
- * Returns the DataObject saved as an XML document with the specified root element.
- * Same as
- * StringWriter stringWriter = new StringWriter();
- * save(createDocument(dataObject, rootElementURI, rootElementName),
- * stringWriter, null);
- * stringWriter.toString();
- *
- * @param dataObject specifies DataObject to be saved
- * @param rootElementURI the Target Namespace URI of the root XML element
- * @param rootElementName the Name of the root XML element
- * @return the saved XML document as a string
- * @throws IllegalArgumentException if the dataObject tree
- * is not closed or has no container.
- */
- String save(DataObject dataObject, String rootElementURI, String rootElementName);
-
- /**
- * Saves the DataObject as an XML document with the specified root element.
- * Same as
- * save(createDocument(dataObject, rootElementURI, rootElementName),
- * outputStream, null);
- *
- * @param dataObject specifies DataObject to be saved
- * @param rootElementURI the Target Namespace URI of the root XML element
- * @param rootElementName the Name of the root XML element
- * @param outputStream specifies the OutputStream to write to.
- * @throws IOException for stream exceptions.
- * @throws IllegalArgumentException if the dataObject tree
- * is not closed or has no container.
- */
- void save(DataObject dataObject, String rootElementURI, String rootElementName, OutputStream outputStream) throws IOException;
-
- /**
- * Serializes an XMLDocument as an XML document into the outputStream.
- * If the DataObject's Type was defined by an XSD, the serialization
- * will follow the XSD.
- * Otherwise the serialization will follow the format as if an XSD
- * were generated as defined by the SDO specification.
- * The OutputStream will be flushed after writing.
- * Does not perform validation to ensure compliance with an XSD.
- * @param xmlDocument specifies XMLDocument to be saved
- * @param outputStream specifies the OutputStream to write to.
- * @param options implementation-specific options.
- * @throws IOException for stream exceptions.
- * @throws IllegalArgumentException if the dataObject tree
- * is not closed or has no container.
- */
- void save(XMLDocument xmlDocument, OutputStream outputStream, Object options) throws IOException;
-
- /**
- * Serializes an XMLDocument as an XML document into the outputWriter.
- * If the DataObject's Type was defined by an XSD, the serialization
- * will follow the XSD.
- * Otherwise the serialization will follow the format as if an XSD
- * were generated as defined by the SDO specification.
- * The OutputStream will be flushed after writing.
- * Does not perform validation to ensure compliance with an XSD.
- * @param xmlDocument specifies XMLDocument to be saved
- * @param outputWriter specifies the Writer to write to.
- * @param options implementation-specific options.
- * @throws IOException for stream exceptions.
- * @throws IllegalArgumentException if the dataObject tree
- * is not closed or has no container.
- */
- void save(XMLDocument xmlDocument, Writer outputWriter, Object options) throws IOException;
-
- /**
- * Creates an XMLDocument with the specified XML rootElement for the DataObject.
- * @param dataObject specifies DataObject to be saved
- * @param rootElementURI the Target Namespace URI of the root XML element
- * @param rootElementName the Name of the root XML element
- * @return XMLDocument a new XMLDocument set with the specified parameters.
- */
- XMLDocument createDocument(DataObject dataObject, String rootElementURI, String rootElementName);
-
- /**
- * The default XMLHelper.
- */
- XMLHelper INSTANCE = HelperProvider.getXMLHelper();
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XSDHelper.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XSDHelper.java
deleted file mode 100644
index 7b4a99493c..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/helper/XSDHelper.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo.helper;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.List;
-import java.util.Map;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * Provides access to additional information when the
- * Type or Property is defined by an XML Schema (XSD).
- * Methods return null/false otherwise or if the information is unavailable.
- * Defines Types from an XSD.
-*/
-public interface XSDHelper
-{
- /**
- * Returns the local name as declared in the XSD.
- * @param type to return local name for.
- * @return the local name as declared in the XSD.
- */
- String getLocalName(Type type);
-
- /**
- * Returns the local name as declared in the XSD.
- * @param property to return local name for.
- * @return the local name as declared in the XSD.
- */
- String getLocalName(Property property);
-
- /**
- * Returns the namespace URI as declared in the XSD.
- * @param property to return namespace URI for.
- * @return the namespace URI as declared in the XSD.
- */
- String getNamespaceURI(Property property);
-
- /**
- * Returns true if the property is declared as an attribute in the XSD.
- * Returns false if not known or for advanced cases.
- * It is possible for both isAttribute and isElement to return false
- * but they will not both return true.
- * @param property to identify if an attribute.
- * @return true if the property is declared as an attribute in the XSD.
- */
- boolean isAttribute(Property property);
-
- /**
- * Returns true if the property is declared as an element in the XSD.
- * Returns false if not known or for advanced cases.
- * It is possible for both isAttribute and isElement to return false
- * but they will not both return true.
- * @param property to identify if an element.
- * @return true if the property is declared as an element in the XSD.
- */
- boolean isElement(Property property);
-
- /**
- * Returns true if the Type is declared to contain mixed content.
- * A DataObject's mixed content values are typically accessed via a Sequence.
- * @param type to identify if mixed content.
- * @return true if the Type is declared to contain mixed content.
- */
- boolean isMixed(Type type);
-
- /**
- * Indicates if this helper contains XSD information for the specified type.
- * @param type the type.
- * @return true if this helper contains XSD information for the specified type.
- */
- boolean isXSD(Type type);
-
- /**
- * Returns the Property defined by the named global element or attribute
- * in the targetNamespace uri, or null if not found.
- * @param uri The uri of the targetNamespace.
- * @param propertyName The name of the global property.
- * @param isElement is true for global elements, false for global attributes.
- * @return the Property defined by the named global element or attribute
- * in the targetNamespace uri, or null if not found.
- */
- Property getGlobalProperty(String uri, String propertyName, boolean isElement);
-
- /**
- * Return the appinfo declared for this Type and source.
- * The appinfo start and end tags and content are returned.
- * The xml namespace context is preserved in the appinfo element.
- * If more than one appinfo with the same source is declared on the same
- * Type their contents are concatenated.
- * @param type the type with the appinfo declaration
- * @param source the source of the appinfo declaration.
- * @return the appinfo declared for this Type and source.
- */
- String getAppinfo(Type type, String source);
-
- /**
- * Return the content of the appinfo declared for this Property and source.
- * If the property is defined by ref= the appinfo of the referenced
- * element or attribute is included.
- * The appinfo start and end tags and content are returned.
- * The xml namespace context is preserved in the appinfo element.
- * If more than one appinfo with the same source is declared on the same
- * Type their contents are concatenated.
- * @param property the Property with the appinfo declaration
- * @param source the source of the appinfo declaration.
- * @return the appinfo declared for this Property and source.
- */
- String getAppinfo(Property property, String source);
-
- /**
- * Define the XML Schema as Types.
- * The Types are available through TypeHelper and DataGraph getType() methods.
- * Same as define(new StringReader(xsd), null)
- * @param xsd the XML Schema.
- * @return the defined Types.
- * @throws IllegalArgumentException if the Types could not be defined.
- */
- List /*Type*/ define(String xsd);
-
- /**
- * Define XML Schema as Types.
- * The Types are available through TypeHelper and DataGraph getType() methods.
- * @param xsdReader reader to an XML Schema.
- * @param schemaLocation the URI of the location of the schema, used
- * for processing relative imports and includes. May be null if not used.
- * @return the defined Types.
- * @throws IllegalArgumentException if the Types could not be defined.
- */
- List /*Type*/ define(Reader xsdReader, String schemaLocation);
-
- /**
- * Define XML Schema as Types.
- * The Types are available through TypeHelper and DataGraph getType() methods.
- * @param xsdInputStream input stream to an XML Schema.
- * @param schemaLocation the URI of the location of the schema, used
- * for processing relative imports and includes. May be null if not used.
- * @return the defined Types.
- * @throws IllegalArgumentException if the Types could not be defined.
- */
- List /*Type*/ define(InputStream xsdInputStream, String schemaLocation);
-
- /**
- * Generate an XML Schema Declaration (XSD) from Types.
- * Same as generate(types, null);
- * @param types a List containing the Types
- * @return a String containing the generated XSD.
- * @throws IllegalArgumentException if the XSD could not be generated.
- */
- String generate(List /*Type*/ types);
-
- /**
- * Generate an XML Schema Declaration (XSD) from Types.
- * Round trip from SDO to XSD to SDO is supported.
- * Round trip from XSD to SDO to XSD is not supported.
- * Use the original schema if one exists instead of generating a new one, as
- * the generated XSD validates a different set of documents than the original XSD.
- * Generating an XSD does not affect the XSDHelper or the Types.
- * The Types must all have the same URI.
- * The result is a String containing the generated XSD.
- * All Types referenced with the same URI will be generated in the XSD
- * and the list will be expanded to include all types generated.
- * Any Types referenced with other URIs will cause
- * imports to be produced as appropriate.
- * Imports will include a schemaLocation if a Map is provided with an entry
- * of the form key=import target namespace, value=schemaLocation
- * @param types a List containing the Types
- * @param namespaceToSchemaLocation map of target namespace to schema locations or null
- * @return a String containing the generated XSD.
- * @throws IllegalArgumentException if the XSD could not be generated.
- */
- String generate(List /*Type*/ types, Map /*String, String*/ namespaceToSchemaLocation);
-
- /**
- * The default XSDHelper.
- */
- XSDHelper INSTANCE = HelperProvider.getXSDHelper();
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java
deleted file mode 100644
index 886138d3a5..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
-package commonj.sdo.impl;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-
-/**
- * Delegates DataObject serialization while ensuring implementation independent
- * java.io.Serialization. An implementation of DataObject
- * returns an ExternalizableDelegator from its writeReplace() method.
- *
- * The root DataObject is the object returned from do.getRootObject() where
- * do is the DataObject being serialized in a java.io.ObjectOutputStream.
- * When do.getContainer() == null then do is a root object.
- *
- * The byte format for each DataObject in the stream is:
- * [0] [path] [root] // when do is not a root object
- * [1] [rootXML] // when do is a root object
- *
- * where:
- * [0] is the byte 0, serialized using writeByte(0).
- * [1] is the byte 1, serialized using writeByte(1).
- *
- * [path] is an SDO path expression from the root DataObject to the serialized
- * DataObject such that root.getDataObject(path) == do.
- * Serialized using writeUTF(path).
- *
- * [root] is the root object serialized using writeObject(root).
- *
- * [rootXML] is the GZip of the XML serialization of the root DataObject.
- * The XML serialization is the same as
- * XMLHelper.INSTANCE.save(root, "commonj.sdo", "dataObject", stream);
- * where stream is a GZIPOutputStream, length is the number of bytes
- * in the stream, and bytes are the contents of the stream.
- * Serialized using writeInt(length), write(bytes).
- *
- */
-public class ExternalizableDelegator implements Externalizable
-{
- public interface Resolvable extends Externalizable
- {
- Object readResolve() throws ObjectStreamException;
- }
-
- static final long serialVersionUID = 1;
- transient Resolvable delegate;
-
- public ExternalizableDelegator()
- {
- delegate = HelperProvider.createResolvable();
- }
-
- public ExternalizableDelegator(Object target)
- {
- delegate = HelperProvider.createResolvable(target);
- }
-
- public void writeExternal(ObjectOutput out) throws IOException
- {
- delegate.writeExternal(out);
- }
-
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
- delegate.readExternal(in);
- }
-
- public Object readResolve() throws ObjectStreamException
- {
- return delegate.readResolve();
- }
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/HelperProvider.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/HelperProvider.java
deleted file mode 100644
index f250a1dc8a..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/HelperProvider.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/**
- *
- * Copyright 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package commonj.sdo.impl;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import commonj.sdo.helper.CopyHelper;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.DataHelper;
-import commonj.sdo.helper.EqualityHelper;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * A HelperProvider obtains specific default helpers and other
- * implementation-specific objects used by a Java implementation of SDO.
- *
- * @version $Rev$ $Date$
- */
-public abstract class HelperProvider {
- /**
- * The default HelperProvider INSTANCE. This is located using the ClassLoader used
- * to load the HelperProvider class itself and if no default implementation is available
- * this field will be set to null.
- */
- public static final HelperProvider INSTANCE;
-
- /**
- * The name of the resource that is used for service location.
- */
- public static final String SERVICE_RESOURCE_NAME = "META-INF/services/commonj.sdo.impl.HelperProvider";
-
- /**
- * The name of the system property that will be checked for an implementation name.
- */
- public static final String PROPERTY_NAME = "commonj.sdo.impl.HelperProvider";
-
- static {
- // initialize the default instance using this class's classloader
- // set to null if none could be located (implies no default implementation)
- HelperProvider provider;
- try {
- provider = getInstance(HelperProvider.class.getClassLoader());
- } catch (NoHelperProviderException e) {
- provider = null;
- }
- INSTANCE = provider;
- }
-
- /**
- * Locate and instantiate a HelperProvider.
- * <p/>
- * Attempt to locate a HelperProvider using first the Thread's current context classloader and then,
- * if that is not set, not readable, or does not provide an implementation, using the classloader
- * used to load the HelperProvider class itself.
- * <p/>
- * A new instance is returned for each sucessful invocation.
- *
- * @return an implementation of HelperProvider
- * @throws NoHelperProviderException if no provider implementation was defined or it could not be instantiated
- */
- public static HelperProvider getInstance() throws NoHelperProviderException {
- String implName = getImplementationName();
-
- ClassLoader cl = getContextClassLoader();
- if (cl != null) {
- HelperProvider provider = loadImplementation(cl, implName);
- if (provider != null) {
- return provider;
- }
- }
-
- cl = HelperProvider.class.getClassLoader();
- HelperProvider provider = loadImplementation(cl, implName);
- if (provider != null) {
- return provider;
- }
-
- throw new NoHelperProviderException(implName);
- }
-
-
- /**
- * Locate and instantiate a HelperProvider using the supplied ClassLoader.
- * <p/>
- * The name of the implementation to use is determined by the value of the "commonj.sdo.impl.HelperProvider"
- * system property. If this is not set or this code does not have permission to read it then the name
- * will be retrieved from the META-INF/services/commonj.sdo.impl.HelperProvider resource as returned
- * by the supplied classloader as described in the
- * <a href="http://java.sun.com/j2se/1.5.0/docs/guide/jar/jar.html#Service%20Provider">JAR file specification</a>.
- * <p/>
- * A new instance is returned for each sucessful invocation.
- *
- * @param cl the classloader to use to locate and instantiate the implementation
- * @return the specified implementation of HelperProvider
- * @throws NoHelperProviderException if no provider implementation was defined or it could not be instantiated
- */
- public static HelperProvider getInstance(ClassLoader cl) throws NoHelperProviderException {
- String implName = getImplementationName();
- HelperProvider provider = loadImplementation(cl, implName);
- if (provider == null) {
- throw new NoHelperProviderException(implName);
- }
- return provider;
- }
-
- private static ClassLoader getContextClassLoader() {
- try {
- return (ClassLoader)AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- return Thread.currentThread().getContextClassLoader();
- }
- });
- } catch (SecurityException e) {
- return null;
- }
- }
-
- private static HelperProvider loadImplementation(ClassLoader cl, String implName) throws NoHelperProviderException {
- // if no name is requested, locate using the supplied classloader
- if (implName == null) {
- implName = getImplementationName(cl);
- }
- // no implementation to try, return null
- if (implName == null) {
- return null;
- }
-
- // try an instantiate the implementation
- try {
- return (HelperProvider) cl.loadClass(implName).newInstance();
- } catch (InstantiationException e) {
- throw new NoHelperProviderException(implName, e);
- } catch (IllegalAccessException e) {
- throw new NoHelperProviderException(implName, e);
- } catch (ClassNotFoundException e) {
- throw new NoHelperProviderException(implName, e);
- }
- }
-
- private static String getImplementationName() {
- try {
- return (String)AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- return System.getProperty(PROPERTY_NAME);
- }
- });
- } catch (SecurityException e) {
- return null;
- }
- }
-
- private static String getImplementationName(ClassLoader cl) {
- InputStream is = cl.getResourceAsStream(SERVICE_RESOURCE_NAME);
- if (is == null) {
- return null;
- }
-
- InputStreamReader in;
- try {
- in = new InputStreamReader(is, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new AssertionError("UTF-8 encoding not available");
- }
-
- try {
- BufferedReader reader = new BufferedReader(in, 128);
- try {
- String line;
- while ((line = reader.readLine()) != null) {
- int i = line.indexOf('#');
- if (i != -1) {
- line = line.substring(0, i);
- }
- line = line.trim();
- if (line.length() > 0) {
- return line;
- }
- }
- return null;
- } finally {
- reader.close();
- }
- } catch (IOException e) {
- throw new NoHelperProviderException(e);
- }
- }
-
-
- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // implementation specific methods for users that don't want to use the default implementation
-
- /**
- * Returns a CopyHelper obtained from this implementation.
- *
- * @return a CopyHelper obtained from this implementation
- */
- public abstract CopyHelper copyHelper();
-
- /**
- * Returns a DataFactory obtained from this implementation.
- *
- * @return a DataFactory obtained from this implementation
- */
- public abstract DataFactory dataFactory();
-
- /**
- * Returns a DataHelper obtained from this implementation.
- *
- * @return a DataHelper obtained from this implementation
- */
- public abstract DataHelper dataHelper();
-
- /**
- * Returns a EqualityHelper obtained from this implementation.
- *
- * @return a EqualityHelper obtained from this implementation
- */
- public abstract EqualityHelper equalityHelper();
-
- /**
- * Returns a TypeHelper obtained from this implementation.
- *
- * @return a TypeHelper obtained from this implementation
- */
- public abstract TypeHelper typeHelper();
-
- /**
- * Returns a XMLHelper obtained from this implementation.
- *
- * @return a XMLHelper obtained from this implementation
- */
- public abstract XMLHelper xmlHelper();
-
- /**
- * Returns a XSDHelper obtained from this implementation.
- *
- * @return a XSDHelper obtained from this implementation
- */
- public abstract XSDHelper xsdHelper();
-
- /**
- * Create a Resolvable using this implementation
- *
- * @return a Resolvable created using this implementation
- */
- public abstract ExternalizableDelegator.Resolvable resolvable();
-
- /**
- * Create a Resolvable using this implementation
- *
- * @param target the object to be resolved
- * @return a Resolvable created using this implementation
- */
- public abstract ExternalizableDelegator.Resolvable resolvable(Object target);
-
-
- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // static helper methods required by the specification
-
- /**
- * Returns a CopyHelper obtained from the default HelperProvider.
- *
- * @return a CopyHelper obtained from the default HelperProvider
- */
- public static CopyHelper getCopyHelper() {
- return INSTANCE.copyHelper();
- }
-
- /**
- * Returns a DataFactory obtained from the default HelperProvider.
- *
- * @return a DataFactory obtained from the default HelperProvider
- */
- public static DataFactory getDataFactory() {
- return INSTANCE.dataFactory();
- }
-
- /**
- * Returns a DataHelper obtained from the default HelperProvider.
- *
- * @return a DataHelper obtained from the default HelperProvider
- */
- public static DataHelper getDataHelper() {
- return INSTANCE.dataHelper();
- }
-
- /**
- * Returns a EqualityHelper obtained from the default HelperProvider.
- *
- * @return a EqualityHelper obtained from the default HelperProvider
- */
- public static EqualityHelper getEqualityHelper() {
- return INSTANCE.equalityHelper();
- }
-
- /**
- * Returns a TypeHelper obtained from the default HelperProvider.
- *
- * @return a TypeHelper obtained from the default HelperProvider
- */
- public static TypeHelper getTypeHelper() {
- return INSTANCE.typeHelper();
- }
-
- /**
- * Returns a XMLHelper obtained from the default HelperProvider.
- *
- * @return a XMLHelper obtained from the default HelperProvider
- */
- public static XMLHelper getXMLHelper() {
- return INSTANCE.xmlHelper();
- }
-
- /**
- * Returns a XSDHelper obtained from the default HelperProvider.
- *
- * @return a XSDHelper obtained from the default HelperProvider
- */
- public static XSDHelper getXSDHelper() {
- return INSTANCE.xsdHelper();
- }
-
- /**
- * Create a Resolvable using the default HelperProvider
- *
- * @return a Resolvable created using the default HelperProvider
- */
- public static ExternalizableDelegator.Resolvable createResolvable() {
- return INSTANCE.resolvable();
- }
-
- /**
- * Create a Resolvable using the default HelperProvider
- *
- * @param target the object to be resolved
- * @return a Resolvable created using the default HelperProvider
- */
- public static ExternalizableDelegator.Resolvable createResolvable(Object target) {
- return INSTANCE.resolvable(target);
- }
-} \ No newline at end of file
diff --git a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/NoHelperProviderException.java b/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/NoHelperProviderException.java
deleted file mode 100644
index 47e6059f49..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/java/commonj/sdo/impl/NoHelperProviderException.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- *
- * Copyright 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package commonj.sdo.impl;
-
-/**
- * Exception indicating that a HelperProvider could not be located or instantiated.
- * The message will be set to the name of the implementation class; a null value
- * indicates that the name of the implementation could not be determined.
- * The cause will be set to the Throwable that prevented the provider from being
- * located or created.
- *
- * @version $Revision$ $Date$
- */
-public class NoHelperProviderException extends RuntimeException {
- private static final long serialVersionUID = 727646133930924084L;
-
- public NoHelperProviderException() {
- }
-
- public NoHelperProviderException(String message) {
- super(message);
- }
-
- public NoHelperProviderException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public NoHelperProviderException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Return the name of the implementation class that could not be provided.
- *
- * @return the name of the implementation class; may be null if not known
- */
- public String getImplementationName() {
- return getMessage();
- }
-}
diff --git a/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/LICENSE.txt b/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 25d78feeac..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,1277 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-APACHE TUSCANY SUBCOMPONENTS:
-
-The Apache Tuscany distribution includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================
-
-For the Eclipse Modeling Framework component and the Celtix binding:
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the
-Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this
-Agreement.
-
-"Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor, if
-any, in source code and object code form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow
-Recipient to distribute the Program, it is Recipient's responsibility
-to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the
-Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a
-commercial product offering should do so in a manner which does not
-create potential liability for other Contributors. Therefore, if a
-Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend
-and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising
-from claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the acts
-or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement.
-In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b)
-allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such
-claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable
-laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), 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 OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of
-the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign
-the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions)
-may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives
-no rights or licenses to the intellectual property of any Contributor
-under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.
-
-===============================================================================
-
-For the Rhino JavaScript container component:
-
-Mozilla Public License 1.1 (MPL 1.1)
-
-1. Definitions.
-
- 1.0.1. "Commercial Use" means distribution or otherwise making the
-Covered Code available to a third party.
-
- 1.1. "Contributor" means each entity that creates or contributes to
-the creation of Modifications.
-
- 1.2. "Contributor Version" means the combination of the Original Code,
-prior Modifications used by a Contributor, and the Modifications made by that
-particular Contributor.
-
- 1.3. "Covered Code" means the Original Code or Modifications or the
-combination of the Original Code and Modifications, in each case including
-portions thereof.
-
- 1.4. "Electronic Distribution Mechanism" means a mechanism generally
-accepted in the software development community for the electronic transfer of
-data.
-
- 1.5. "Executable" means Covered Code in any form other than Source
-Code.
-
- 1.6. "Initial Developer" means the individual or entity identified as
-the Initial Developer in the Source Code notice required by Exhibit A.
-
- 1.7. "Larger Work" means a work which combines Covered Code or
-portions thereof with code not governed by the terms of this License.
-
- 1.8. "License" means this document.
-
- 1.8.1. "Licensable" means having the right to grant, to the maximum
-extent possible, whether at the time of the initial grant or subsequently
-acquired, any and all of the rights conveyed herein.
-
- 1.9. "Modifications" means any addition to or deletion from the
-substance or structure of either the Original Code or any previous
-Modifications. When Covered Code is released as a series of files, a
-Modification is:
- A. Any addition to or deletion from the contents of a file
-containing Original Code or previous Modifications.
-
- B. Any new file that contains any part of the Original Code or
-previous Modifications.
-
- 1.10. "Original Code" means Source Code of computer software code
-which is described in the Source Code notice required by Exhibit A as Original
-Code, and which, at the time of its release under this License is not already
-Covered Code governed by this License.
-
- 1.10.1. "Patent Claims" means any patent claim(s), now owned or
-hereafter acquired, including without limitation, method, process, and
-apparatus claims, in any patent Licensable by grantor.
-
- 1.11. "Source Code" means the preferred form of the Covered Code for
-making modifications to it, including all modules it contains, plus any
-associated interface definition files, scripts used to control compilation and
-installation of an Executable, or source code differential comparisons against
-either the Original Code or another well known, available Covered Code of the
-Contributor's choice. The Source Code can be in a compressed or archival form,
-provided the appropriate decompression or de-archiving software is widely
-available for no charge.
-
- 1.12. "You" (or "Your") means an individual or a legal entity
-exercising rights under, and complying with all of the terms of, this License
-or a future version of this License issued under Section 6.1. For legal
-entities, "You" includes any entity which controls, is controlled by, or is
-under common control with You. For purposes of this definition, "control"
-means (a) the power, direct or indirect, to cause the direction or management
-of such entity, whether by contract or otherwise, or (b) ownership of more
-than fifty percent (50%) of the outstanding shares or beneficial ownership of
-such entity.
-
-2. Source Code License.
-
- 2.1. The Initial Developer Grant.
- The Initial Developer hereby grants You a world-wide, royalty-free,
-non-exclusive license, subject to third party intellectual property claims:
- (a) under intellectual property rights (other than patent or
-trademark) Licensable by Initial Developer to use, reproduce, modify, display,
-perform, sublicense and distribute the Original Code (or portions thereof)
-with or without Modifications, and/or as part of a Larger Work; and
-
- (b) under Patents Claims infringed by the making, using or selling
-of Original Code, to make, have made, use, practice, sell, and offer for sale,
-and/or otherwise dispose of the Original Code (or portions thereof).
- (c) the licenses granted in this Section 2.1(a) and
-(b) are effective on the date Initial Developer first distributes Original
-Code under the terms of this License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is
-granted: 1) for code that You delete from the Original Code; 2) separate from
-the Original Code; or 3) for infringements caused by: i) the modification of
-the Original Code or ii) the combination of the Original Code with other
-software or devices.
-
- 2.2. Contributor Grant.
- Subject to third party intellectual property claims, each Contributor
-hereby grants You a world-wide, royalty-free, non-exclusive license
-
- (a) under intellectual property rights (other than patent or
-trademark) Licensable by Contributor, to use, reproduce, modify, display,
-perform, sublicense and distribute the Modifications created by such
-Contributor (or portions thereof) either on an unmodified basis, with other
-Modifications, as Covered Code and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling
-of Modifications made by that Contributor either alone and/or in combination
-with its Contributor Version (or portions of such combination), to make, use,
-sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications
-made by that Contributor (or portions thereof); and 2) the combination of
-Modifications made by that Contributor with its Contributor Version (or
-portions of such combination).
-
- (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-effective on the date Contributor first makes Commercial Use of the Covered
-Code.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is
-granted: 1) for any code that Contributor has deleted from the Contributor
-Version; 2) separate from the Contributor Version; 3) for infringements
-caused by: i) third party modifications of Contributor Version or ii) the
-combination of Modifications made by that Contributor with other software
-(except as part of the Contributor Version) or other devices; or 4) under
-Patent Claims infringed by Covered Code in the absence of Modifications made
-by that Contributor.
-
-
-3. Distribution Obligations.
-
- 3.1. Application of License.
- The Modifications which You create or to which You contribute are
-governed by the terms of this License, including without limitation Section
-2.2. The Source Code version of Covered Code may be distributed only under the
-terms of this License or a future version of this License released under
-Section 6.1, and You must include a copy of this License with every copy of
-the Source Code You distribute. You may not offer or impose any terms on any
-Source Code version that alters or restricts the applicable version of this
-License or the recipients' rights hereunder. However, You may include an
-additional document offering the additional rights described in Section 3.5.
-
- 3.2. Availability of Source Code.
- Any Modification which You create or to which You contribute must be
-made available in Source Code form under the terms of this License either on
-the same media as an Executable version or via an accepted Electronic
-Distribution Mechanism to anyone to whom you made an Executable version
-available; and if made available via Electronic Distribution Mechanism, must
-remain available for at least twelve (12) months after the date it initially
-became available, or at least six (6) months after a subsequent version of
-that particular Modification has been made available to such recipients. You
-are responsible for ensuring that the Source Code version remains available
-even if the Electronic Distribution Mechanism is maintained by a third party.
-
- 3.3. Description of Modifications.
- You must cause all Covered Code to which You contribute to contain a
-file documenting the changes You made to create that Covered Code and the date
-of any change. You must include a prominent statement that the Modification is
-derived, directly or indirectly, from Original Code provided by the Initial
-Developer and including the name of the Initial Developer in (a) the Source
-Code, and (b) in any notice in an Executable version or related documentation
-in which You describe the origin or ownership of the Covered Code.
-
- 3.4. Intellectual Property Matters
- (a) Third Party Claims.
- If Contributor has knowledge that a license under a third party's
-intellectual property rights is required to exercise the rights granted by
-such Contributor under Sections 2.1 or 2.2, Contributor must include a text
-file with the Source Code distribution titled "LEGAL" which describes the
-claim and the party making the claim in sufficient detail that a recipient
-will know whom to contact. If Contributor obtains such knowledge after the
-Modification is made available as described in Section 3.2, Contributor shall
-promptly modify the LEGAL file in all copies Contributor makes available
-thereafter and shall take other steps (such as notifying appropriate mailing
-lists or newsgroups) reasonably calculated to inform those who received the
-Covered Code that new knowledge has been obtained.
-
- (b) Contributor APIs.
- If Contributor's Modifications include an application programming
-interface and Contributor has knowledge of patent licenses which are
-reasonably necessary to implement that API, Contributor must also include this
-information in the LEGAL file.
-
- (c) Representations.
- Contributor represents that, except as disclosed pursuant to
-Section 3.4(a) above, Contributor believes that Contributor's Modifications
-are Contributor's original creation(s) and/or Contributor has sufficient
-rights to grant the rights conveyed by this License.
-
-
- 3.5. Required Notices.
- You must duplicate the notice in Exhibit A in each file of the Source
-Code. If it is not possible to put such notice in a particular Source Code
-file due to its structure, then You must include such notice in a location
-(such as a relevant directory) where a user would be likely to look for such a
-notice. If You created one or more Modification(s) You may add your name as a
-Contributor to the notice described in Exhibit A. You must also duplicate
-this License in any documentation for the Source Code where You describe
-recipients' rights or ownership rights relating to Covered Code. You may
-choose to offer, and to charge a fee for, warranty, support, indemnity or
-liability obligations to one or more recipients of Covered Code. However, You
-may do so only on Your own behalf, and not on behalf of the Initial Developer
-or any Contributor. You must make it absolutely clear than any such warranty,
-support, indemnity or liability obligation is offered by You alone, and You
-hereby agree to indemnify the Initial Developer and every Contributor for any
-liability incurred by the Initial Developer or such Contributor as a result of
-warranty, support, indemnity or liability terms You offer.
-
- 3.6. Distribution of Executable Versions.
- You may distribute Covered Code in Executable form only if the
-requirements of Section 3.1-3.5 have been met for that Covered Code, and if
-You include a notice stating that the Source Code version of the Covered Code
-is available under the terms of this License, including a description of how
-and where You have fulfilled the obligations of Section 3.2. The notice must
-be conspicuously included in any notice in an Executable version, related
-documentation or collateral in which You describe recipients' rights relating
-to the Covered Code. You may distribute the Executable version of Covered Code
-or ownership rights under a license of Your choice, which may contain terms
-different from this License, provided that You are in compliance with the
-terms of this License and that the license for the Executable version does not
-attempt to limit or alter the recipient's rights in the Source Code version
-from the rights set forth in this License. If You distribute the Executable
-version under a different license You must make it absolutely clear that any
-terms which differ from this License are offered by You alone, not by the
-Initial Developer or any Contributor. You hereby agree to indemnify the
-Initial Developer and every Contributor for any liability incurred by the
-Initial Developer or such Contributor as a result of any such terms You offer.
-
- 3.7. Larger Works.
- You may create a Larger Work by combining Covered Code with other code
-not governed by the terms of this License and distribute the Larger Work as a
-single product. In such a case, You must make sure the requirements of this
-License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
- If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Code due to statute,
-judicial order, or regulation then You must: (a) comply with the terms of this
-License to the maximum extent possible; and (b) describe the limitations and
-the code they affect. Such description must be included in the LEGAL file
-described in Section 3.4 and must be included with all distributions of the
-Source Code. Except to the extent prohibited by statute or regulation, such
-description must be sufficiently detailed for a recipient of ordinary skill to
-be able to understand it.
-
-5. Application of this License.
-
- This License applies to code to which the Initial Developer has attached
-the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
- 6.1. New Versions.
- Netscape Communications Corporation ("Netscape") may publish revised
-and/or new versions of the License from time to time. Each version will be
-given a distinguishing version number.
-
- 6.2. Effect of New Versions.
- Once Covered Code has been published under a particular version of the
-License, You may always continue to use it under the terms of that version.
-You may also choose to use such Covered Code under the terms of any subsequent
-version of the License published by Netscape. No one other than Netscape has
-the right to modify the terms applicable to Covered Code created under this
-License.
-
- 6.3. Derivative Works.
- If You create or use a modified version of this License (which you may
-only do in order to apply it to code which is not already Covered Code
-governed by this License), You must (a) rename Your license so that the
-phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL", "NPL" or
-any confusingly similar phrase do not appear in your license (except to note
-that your license differs from this License) and (b) otherwise make it clear
-that Your version of the license contains terms which differ from the Mozilla
-Public License and Netscape Public License. (Filling in the name of the
-Initial Developer, Original Code or Contributor in the notice described in
-Exhibit A shall not of themselves be deemed to be modifications of this
-License.)
-
-7. DISCLAIMER OF WARRANTY.
-
- COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE,
-FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE
-QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED
-CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
-OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
-CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
-LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-DISCLAIMER.
-
-8. TERMINATION.
-
- 8.1. This License and the rights granted hereunder will terminate
-automatically if You fail to comply with terms herein and fail to cure such
-breach within 30 days of becoming aware of the breach. All sublicenses to the
-Covered Code which are properly granted shall survive any termination of this
-License. Provisions which, by their nature, must remain in effect beyond the
-termination of this License shall survive.
-
- 8.2. If You initiate litigation by asserting a patent infringement
-claim (excluding declatory judgment actions) against Initial Developer or a
-Contributor (the Initial Developer or Contributor against whom You file such
-action is referred to as "Participant") alleging that:
-
- (a) such Participant's Contributor Version directly or indirectly
-infringes any patent, then any and all rights granted by such Participant to
-You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
-from Participant terminate prospectively, unless if within 60 days after
-receipt of notice You either: (i) agree in writing to pay Participant a
-mutually agreeable reasonable royalty for Your past and future use of
-Modifications made by such Participant, or (ii) withdraw Your litigation claim
-with respect to the Contributor Version against such Participant. If within
-60 days of notice, a reasonable royalty and payment arrangement are not
-mutually agreed upon in writing by the parties or the litigation claim is not
-withdrawn, the rights granted by Participant to You under Sections 2.1 and/or
-2.2 automatically terminate at the expiration of the 60 day notice period
-specified above.
-
- (b) any software, hardware, or device, other than such Participant's
-Contributor Version, directly or indirectly infringes any patent, then any
-rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are
-revoked effective as of the date You first made, used, sold, distributed, or
-had made, Modifications made by that Participant.
-
- 8.3. If You assert a patent infringement claim against Participant
-alleging that such Participant's Contributor Version directly or indirectly
-infringes any patent where such claim is resolved (such as by license or
-settlement) prior to the initiation of patent infringement litigation, then
-the reasonable value of the licenses granted by such Participant under
-Sections 2.1 or 2.2 shall be taken into account in determining the amount or
-value of any payment or license.
-
- 8.4. In the event of termination under Sections 8.1 or 8.2 above, all
-end user license agreements (excluding distributors and resellers) which have
-been validly granted by You or any distributor hereunder prior to termination
-shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY
-SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
-SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
-WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
-FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES,
-EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH
-DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH
-OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
-EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
- The Covered Code is a "commercial item," as that term is defined in 48
-C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and
-"commercial computer software documentation," as such terms are used in 48
-C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
-227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users
-acquire Covered Code with only those rights set forth herein.
-
-11. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject matter
-hereof. If any provision of this License is held to be unenforceable, such
-provision shall be reformed only to the extent necessary to make it
-enforceable. This License shall be governed by California law provisions
-(except to the extent applicable law, if any, provides otherwise), excluding
-its conflict-of-law provisions. With respect to disputes in which at least one
-party is a citizen of, or an entity chartered or registered to do business in
-the United States of America, any litigation relating to this License shall be
-subject to the jurisdiction of the Federal Courts of the Northern District of
-California, with venue lying in Santa Clara County, California, with the
-losing party responsible for costs, including without limitation, court costs
-and reasonable attorneys' fees and expenses. The application of the United
-Nations Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any law or regulation which provides that the language of
-a contract shall be construed against the drafter shall not apply to this
-License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
-responsible for claims and damages arising, directly or indirectly, out of its
-utilization of rights under this License and You agree to work with Initial
-Developer and Contributors to distribute such responsibility on an equitable
-basis. Nothing herein is intended or shall be deemed to constitute any
-admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
- Initial Developer may designate portions of the Covered Code as
-Multiple-Licensed. Multiple-Licensed means that the Initial Developer permits
-you to utilize portions of the Covered Code under Your choice of the MPL or
-the alternative licenses, if any, specified by the Initial Developer in the
-file described in Exhibit A.
-
-
-EXHIBIT A -Mozilla Public License.
-
- ``The contents of this file are subject to the Mozilla Public License
-Version 1.1 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF
- ANY KIND, either express or implied. See the License for the specific
-language governing rights and
- limitations under the License.
-
- The Original Code is ______________________________________.
-
- The Initial Developer of the Original Code is ________________________.
-Portions created by
- ______________________ are Copyright (C) ______
-_______________________. All Rights
- Reserved.
-
- Contributor(s): ______________________________________.
-
- Alternatively, the contents of this file may be used under the terms of
-the _____ license (the [___] License), in which case the provisions of
-[______] License are applicable instead of those above. If you wish to allow
-use of your version of this file only under the terms of the [____] License
-and not to allow others to use your version of this file under the MPL,
-indicate your decision by deleting the provisions above and replace them
-with the notice and other provisions required by the [___] License. If you do
-not delete the provisions above, a recipient may use your version of this file
-under either the MPL or the [___] License."
-
- [NOTE: The text of this Exhibit A may differ slightly from the text of
-the notices in the Source Code files of the Original Code. You should use the
-text of this Exhibit A rather than the text found in the Original Code Source
-Code for Your Modifications.]
-
-
-===============================================================================
-
-For the JAX-WS Reference Implementation component:
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
- 1. Definitions.
-
- 1.1. "Contributor" means each individual or entity that
- creates or contributes to the creation of Modifications.
-
- 1.2. "Contributor Version" means the combination of the
- Original Software, prior Modifications used by a
- Contributor (if any), and the Modifications made by that
- particular Contributor.
-
- 1.3. "Covered Software" means (a) the Original Software, or
- (b) Modifications, or (c) the combination of files
- containing Original Software with files containing
- Modifications, in each case including portions thereof.
-
- 1.4. "Executable" means the Covered Software in any form
- other than Source Code.
-
- 1.5. "Initial Developer" means the individual or entity
- that first makes Original Software available under this
- License.
-
- 1.6. "Larger Work" means a work which combines Covered
- Software or portions thereof with code not governed by the
- terms of this License.
-
- 1.7. "License" means this document.
-
- 1.8. "Licensable" means having the right to grant, to the
- maximum extent possible, whether at the time of the initial
- grant or subsequently acquired, any and all of the rights
- conveyed herein.
-
- 1.9. "Modifications" means the Source Code and Executable
- form of any of the following:
-
- A. Any file that results from an addition to,
- deletion from or modification of the contents of a
- file containing Original Software or previous
- Modifications;
-
- B. Any new file that contains any part of the
- Original Software or previous Modification; or
-
- C. Any new file that is contributed or otherwise made
- available under the terms of this License.
-
- 1.10. "Original Software" means the Source Code and
- Executable form of computer software code that is
- originally released under this License.
-
- 1.11. "Patent Claims" means any patent claim(s), now owned
- or hereafter acquired, including without limitation,
- method, process, and apparatus claims, in any patent
- Licensable by grantor.
-
- 1.12. "Source Code" means (a) the common form of computer
- software code in which modifications are made and (b)
- associated documentation included in or with such code.
-
- 1.13. "You" (or "Your") means an individual or a legal
- entity exercising rights under, and complying with all of
- the terms of, this License. For legal entities, "You"
- includes any entity which controls, is controlled by, or is
- under common control with You. For purposes of this
- definition, "control" means (a) the power, direct or
- indirect, to cause the direction or management of such
- entity, whether by contract or otherwise, or (b) ownership
- of more than fifty percent (50%) of the outstanding shares
- or beneficial ownership of such entity.
-
- 2. License Grants.
-
- 2.1. The Initial Developer Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and
- subject to third party intellectual property claims, the
- Initial Developer hereby grants You a world-wide,
- royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than
- patent or trademark) Licensable by Initial Developer,
- to use, reproduce, modify, display, perform,
- sublicense and distribute the Original Software (or
- portions thereof), with or without Modifications,
- and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making,
- using or selling of Original Software, to make, have
- made, use, practice, sell, and offer for sale, and/or
- otherwise dispose of the Original Software (or
- portions thereof).
-
- (c) The licenses granted in Sections 2.1(a) and (b)
- are effective on the date Initial Developer first
- distributes or otherwise makes the Original Software
- available to a third party under the terms of this
- License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent
- license is granted: (1) for code that You delete from
- the Original Software, or (2) for infringements
- caused by: (i) the modification of the Original
- Software, or (ii) the combination of the Original
- Software with other software or devices.
-
- 2.2. Contributor Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and
- subject to third party intellectual property claims, each
- Contributor hereby grants You a world-wide, royalty-free,
- non-exclusive license:
-
- (a) under intellectual property rights (other than
- patent or trademark) Licensable by Contributor to
- use, reproduce, modify, display, perform, sublicense
- and distribute the Modifications created by such
- Contributor (or portions thereof), either on an
- unmodified basis, with other Modifications, as
- Covered Software and/or as part of a Larger Work; and
-
-
- (b) under Patent Claims infringed by the making,
- using, or selling of Modifications made by that
- Contributor either alone and/or in combination with
- its Contributor Version (or portions of such
- combination), to make, use, sell, offer for sale,
- have made, and/or otherwise dispose of: (1)
- Modifications made by that Contributor (or portions
- thereof); and (2) the combination of Modifications
- made by that Contributor with its Contributor Version
- (or portions of such combination).
-
- (c) The licenses granted in Sections 2.2(a) and
- 2.2(b) are effective on the date Contributor first
- distributes or otherwise makes the Modifications
- available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent
- license is granted: (1) for any code that Contributor
- has deleted from the Contributor Version; (2) for
- infringements caused by: (i) third party
- modifications of Contributor Version, or (ii) the
- combination of Modifications made by that Contributor
- with other software (except as part of the
- Contributor Version) or other devices; or (3) under
- Patent Claims infringed by Covered Software in the
- absence of Modifications made by that Contributor.
-
- 3. Distribution Obligations.
-
- 3.1. Availability of Source Code.
-
- Any Covered Software that You distribute or otherwise make
- available in Executable form must also be made available in
- Source Code form and that Source Code form must be
- distributed only under the terms of this License. You must
- include a copy of this License with every copy of the
- Source Code form of the Covered Software You distribute or
- otherwise make available. You must inform recipients of any
- such Covered Software in Executable form as to how they can
- obtain such Covered Software in Source Code form in a
- reasonable manner on or through a medium customarily used
- for software exchange.
-
- 3.2. Modifications.
-
- The Modifications that You create or to which You
- contribute are governed by the terms of this License. You
- represent that You believe Your Modifications are Your
- original creation(s) and/or You have sufficient rights to
- grant the rights conveyed by this License.
-
- 3.3. Required Notices.
-
- You must include a notice in each of Your Modifications
- that identifies You as the Contributor of the Modification.
- You may not remove or alter any copyright, patent or
- trademark notices contained within the Covered Software, or
- any notices of licensing or any descriptive text giving
- attribution to any Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms.
-
- You may not offer or impose any terms on any Covered
- Software in Source Code form that alters or restricts the
- applicable version of this License or the recipients'
- rights hereunder. You may choose to offer, and to charge a
- fee for, warranty, support, indemnity or liability
- obligations to one or more recipients of Covered Software.
- However, you may do so only on Your own behalf, and not on
- behalf of the Initial Developer or any Contributor. You
- must make it absolutely clear that any such warranty,
- support, indemnity or liability obligation is offered by
- You alone, and You hereby agree to indemnify the Initial
- Developer and every Contributor for any liability incurred
- by the Initial Developer or such Contributor as a result of
- warranty, support, indemnity or liability terms You offer.
-
-
- 3.5. Distribution of Executable Versions.
-
- You may distribute the Executable form of the Covered
- Software under the terms of this License or under the terms
- of a license of Your choice, which may contain terms
- different from this License, provided that You are in
- compliance with the terms of this License and that the
- license for the Executable form does not attempt to limit
- or alter the recipient's rights in the Source Code form
- from the rights set forth in this License. If You
- distribute the Covered Software in Executable form under a
- different license, You must make it absolutely clear that
- any terms which differ from this License are offered by You
- alone, not by the Initial Developer or Contributor. You
- hereby agree to indemnify the Initial Developer and every
- Contributor for any liability incurred by the Initial
- Developer or such Contributor as a result of any such terms
- You offer.
-
- 3.6. Larger Works.
-
- You may create a Larger Work by combining Covered Software
- with other code not governed by the terms of this License
- and distribute the Larger Work as a single product. In such
- a case, You must make sure the requirements of this License
- are fulfilled for the Covered Software.
-
- 4. Versions of the License.
-
- 4.1. New Versions.
-
- Sun Microsystems, Inc. is the initial license steward and
- may publish revised and/or new versions of this License
- from time to time. Each version will be given a
- distinguishing version number. Except as provided in
- Section 4.3, no one other than the license steward has the
- right to modify this License.
-
- 4.2. Effect of New Versions.
-
- You may always continue to use, distribute or otherwise
- make the Covered Software available under the terms of the
- version of the License under which You originally received
- the Covered Software. If the Initial Developer includes a
- notice in the Original Software prohibiting it from being
- distributed or otherwise made available under any
- subsequent version of the License, You must distribute and
- make the Covered Software available under the terms of the
- version of the License under which You originally received
- the Covered Software. Otherwise, You may also choose to
- use, distribute or otherwise make the Covered Software
- available under the terms of any subsequent version of the
- License published by the license steward.
-
- 4.3. Modified Versions.
-
- When You are an Initial Developer and You want to create a
- new license for Your Original Software, You may create and
- use a modified version of this License if You: (a) rename
- the license and remove any references to the name of the
- license steward (except to note that the license differs
- from this License); and (b) otherwise make it clear that
- the license contains terms which differ from this License.
-
-
- 5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
- BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
- INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
- SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
- PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
- PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
- COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
- INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
- ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
- WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
- ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
- DISCLAIMER.
-
- 6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will
- terminate automatically if You fail to comply with terms
- herein and fail to cure such breach within 30 days of
- becoming aware of the breach. Provisions which, by their
- nature, must remain in effect beyond the termination of
- this License shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding
- declaratory judgment actions) against Initial Developer or
- a Contributor (the Initial Developer or Contributor against
- whom You assert such claim is referred to as "Participant")
- alleging that the Participant Software (meaning the
- Contributor Version where the Participant is a Contributor
- or the Original Software where the Participant is the
- Initial Developer) directly or indirectly infringes any
- patent, then any and all rights granted directly or
- indirectly to You by such Participant, the Initial
- Developer (if the Initial Developer is not the Participant)
- and all Contributors under Sections 2.1 and/or 2.2 of this
- License shall, upon 60 days notice from Participant
- terminate prospectively and automatically at the expiration
- of such 60 day notice period, unless if within such 60 day
- period You withdraw Your claim with respect to the
- Participant Software against such Participant either
- unilaterally or pursuant to a written agreement with
- Participant.
-
- 6.3. In the event of termination under Sections 6.1 or 6.2
- above, all end user licenses that have been validly granted
- by You or any distributor hereunder prior to termination
- (excluding licenses granted to You by any distributor)
- shall survive termination.
-
- 7. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
- (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
- INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
- COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
- LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
- CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
- LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
- STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
- COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
- INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
- LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
- INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
- APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
- NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
- CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
- APPLY TO YOU.
-
- 8. U.S. GOVERNMENT END USERS.
-
- The Covered Software is a "commercial item," as that term is
- defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
- computer software" (as that term is defined at 48 C.F.R.
- 252.227-7014(a)(1)) and "commercial computer software
- documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
- 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
- through 227.7202-4 (June 1995), all U.S. Government End Users
- acquire Covered Software with only those rights set forth herein.
- This U.S. Government Rights clause is in lieu of, and supersedes,
- any other FAR, DFAR, or other clause or provision that addresses
- Government rights in computer software under this License.
-
- 9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject
- matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the
- extent necessary to make it enforceable. This License shall be
- governed by the law of the jurisdiction specified in a notice
- contained within the Original Software (except to the extent
- applicable law, if any, provides otherwise), excluding such
- jurisdiction's conflict-of-law provisions. Any litigation
- relating to this License shall be subject to the jurisdiction of
- the courts located in the jurisdiction and venue specified in a
- notice contained within the Original Software, with the losing
- party responsible for costs, including, without limitation, court
- costs and reasonable attorneys' fees and expenses. The
- application of the United Nations Convention on Contracts for the
- International Sale of Goods is expressly excluded. Any law or
- regulation which provides that the language of a contract shall
- be construed against the drafter shall not apply to this License.
- You agree that You alone are responsible for compliance with the
- United States export administration regulations (and the export
- control laws and regulation of any other countries) when You use,
- distribute or otherwise make available any Covered Software.
-
- 10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
- responsible for claims and damages arising, directly or
- indirectly, out of its utilization of rights under this License
- and You agree to work with Initial Developer and Contributors to
- distribute such responsibility on an equitable basis. Nothing
- herein is intended or shall be deemed to constitute any admission
- of liability.
-
diff --git a/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/MANIFEST.MF b/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 4a1be53389..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Extension-Name: sdo-api
-Specification-Title: SDO API
-Specification-Vendor: Apache Software Foundation
-Implementation-Vendor: Apache Software Foundation
-Implementation-Vendor-Id: org.apache
-Implementation-Title: sdo-api
-Implementation-Version: incubating-M1
-Bundle-ManifestVersion: 2
-Bundle-Name: SDO API
-Bundle-SymbolicName: org.apache.tuscany.sdo.spec
-Bundle-Version: 1.0.0
-Bundle-Vendor: Apache Software Foundation
-Export-Package: commonj.sdo,
- commonj.sdo.helper,
- commonj.sdo.impl
diff --git a/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/NOTICE b/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index d48810c0ec..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,18 +0,0 @@
-=========================================================================
-== NOTICE file corresponding to the section 4 d of ==
-== the Apache License, Version 2.0, ==
-== in this case for the Apache Tuscany distribution. ==
-=========================================================================
-
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
-
-This product also includes software developed by:
-- the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-- the Celtix project (http://celtix.objectweb.org/)
-- the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-- the GlassFish JAX-WS project (https://jax-ws.dev.java.net/)
-
-Please read the LICENSE.txt file present in the root directory of this
-distribution.
-
diff --git a/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/README.txt b/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/README.txt
deleted file mode 100644
index 9b26d1690a..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/resources/META-INF/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Apache Tuscany M1 build (May, 2006)
-===================================
-
-http://incubator.apache.org/tuscany/
-
-Tuscany is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Web Services PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
-
-
-Support
--------
-
-Any problem with this release can be reported to the Tuscany mailing list
-or in the JIRA issue tracker.
-
-Mailing list subscription:
- tuscany-dev-subscribe@ws.apache.org
-
-Jira:
- http://issues.apache.org/jira/browse/Tuscany
-
-
-Thank you for using Tuscany!
-
-
-The Tuscany Team.
-
diff --git a/branches/java-M1/java/spec/sdo/src/main/resources/xml/datagraph.xsd b/branches/java-M1/java/spec/sdo/src/main/resources/xml/datagraph.xsd
deleted file mode 100644
index 30727473a0..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/resources/xml/datagraph.xsd
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
--->
-
-<xsd:schema
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:sdo="commonj.sdo"
- targetNamespace="commonj.sdo">
-
- <xsd:element name="datagraph" type="sdo:DataGraphType"/>
-
- <xsd:complexType name="DataGraphType">
- <xsd:complexContent>
- <xsd:extension base="sdo:BaseDataGraphType">
- <xsd:sequence>
- <xsd:any minOccurs="0" maxOccurs="1" namespace="##other" processContents="lax"/>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="BaseDataGraphType" abstract="true">
- <xsd:sequence>
- <xsd:element name="models" type="sdo:ModelsType" minOccurs="0"/>
- <xsd:element name="xsd" type="sdo:XSDType" minOccurs="0"/>
- <xsd:element name="changeSummary" type="sdo:ChangeSummaryType" minOccurs="0"/>
- </xsd:sequence>
- <xsd:anyAttribute namespace="##other" processContents="lax"/>
- </xsd:complexType>
-
- <xsd:complexType name="ModelsType">
- <xsd:annotation>
- <xsd:documentation>
- Expected type is emof:Package.
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="XSDType">
- <xsd:annotation>
- <xsd:documentation>
- Expected type is xsd:schema.
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="ChangeSummaryType">
- <xsd:sequence>
- <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
- </xsd:sequence>
- <xsd:attribute name="create" type="xsd:string"/>
- <xsd:attribute name="delete" type="xsd:string"/>
- <xsd:attribute name="logging" type="xsd:boolean"/>
- </xsd:complexType>
-
- <xsd:attribute name="ref" type="xsd:string"/>
-
-</xsd:schema>
diff --git a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoJava.xml b/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoJava.xml
deleted file mode 100644
index 08c3b9734c..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoJava.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
--->
-
-<types xmlns="commonj.sdo"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sdoJava="commonj.sdo/java"
- xsi:schemaLocation="commonj.sdo sdoModel.xsd commonj.sdo/java sdoJava.xsd commonj.sdo/xml sdoXML.xsd">
-
-<!--
- JavaInfo declares properties used in open content for
- the Java binding of SDO Types and Properties.
--->
-
- <type name="JavaInfo" uri="commonj.sdo/java">
- <property name="javaClass" type="commonj.sdo#String"/>
- </type>
-
-<!--
- The Java object data types.
--->
-
- <type name="BooleanObject" dataType="true" sdoJava:instanceClass="java.lang.Boolean" uri="commonj.sdo/java"/>
- <type name="ByteObject" dataType="true" sdoJava:instanceClass="java.lang.Byte" uri="commonj.sdo/java"/>
- <type name="CharacterObject" dataType="true" sdoJava:instanceClass="java.lang.Character" uri="commonj.sdo/java"/>
- <type name="DoubleObject" dataType="true" sdoJava:instanceClass="java.lang.Double" uri="commonj.sdo/java"/>
- <type name="FloatObject" dataType="true" sdoJava:instanceClass="java.lang.Float" uri="commonj.sdo/java"/>
- <type name="IntObject" dataType="true" sdoJava:instanceClass="java.lang.Int" uri="commonj.sdo/java"/>
- <type name="LongObject" dataType="true" sdoJava:instanceClass="java.lang.Long" uri="commonj.sdo/java"/>
- <type name="ShortObject" dataType="true" sdoJava:instanceClass="java.lang.Short" uri="commonj.sdo/java"/>
-
-</types>
diff --git a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoJava.xsd b/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoJava.xsd
deleted file mode 100644
index 094a705aa5..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoJava.xsd
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
--->
-
-<xsd:schema
- targetNamespace="commonj.sdo/java"
- xmlns:sdoJava="commonj.sdo/java"
- xmlns:sdo="commonj.sdo"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-<xsd:import namespace="commonj.sdo" schemaLocation="sdoModel.xsd"/>
-
-<!--
- These attributes are used to customize the Java mapping of
- XSD to SDO Types and Properties.
--->
-
-<xsd:attribute name="package" type="xsd:string" />
-<xsd:attribute name="instanceClass" type="xsd:string" />
-<xsd:attribute name="extendedInstanceClass" type="xsd:string" />
-<xsd:attribute name="nestedInterfaces" type="xsd:boolean" />
-
-<!--
- JavaInfo declares properties used in open content for
- the Java binding of SDO Types and Properties.
--->
-
-<!-- FIXME need this global attribute because as per spec Type's with JavaInfo.javaClass cannot be (de)serialized -->
-<xsd:attribute name="javaClass" type="sdo:String"/>
-
-<xsd:complexType name="JavaInfo">
- <xsd:attribute ref="sdoJava:javaClass"/>
-</xsd:complexType>
-
-<!--
- The Java object data types.
--->
-
-<xsd:simpleType name="BooleanObject" sdoJava:instanceClass="java.lang.Boolean">
- <xsd:restriction base="xsd:boolean"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="ByteObject" sdoJava:instanceClass="java.lang.Byte">
- <xsd:restriction base="xsd:byte"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="CharacterObject" sdoJava:instanceClass="java.lang.Character">
- <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="DoubleObject" sdoJava:instanceClass="java.lang.Double">
- <xsd:restriction base="xsd:double"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="FloatObject" sdoJava:instanceClass="java.lang.Float">
- <xsd:restriction base="xsd:float"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="IntObject" sdoJava:instanceClass="java.lang.Integer">
- <xsd:restriction base="xsd:int"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="LongObject" sdoJava:instanceClass="java.lang.Long">
- <xsd:restriction base="xsd:long"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="ShortObject" sdoJava:instanceClass="java.lang.Short">
- <xsd:restriction base="xsd:short"/>
-</xsd:simpleType>
-
-</xsd:schema>
diff --git a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoModel.xml b/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoModel.xml
deleted file mode 100644
index fcd1a4e283..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoModel.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
--->
-
-<types xmlns="commonj.sdo"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sdoJava="commonj.sdo/java"
- xsi:schemaLocation="commonj.sdo sdoModel.xsd commonj.sdo/java sdoJava.xsd commonj.sdo/xml sdoXML.xsd">
-
-<!-- Model Types
- SDO Type and Property are defined in terms of themselves.
--->
-
- <type name="Type" open="true" uri="commonj.sdo">
- <property name="baseType" type="#Type" many="true"/>
- <property name="property" type="#Property" containment="true" many="true"/>
- <property name="aliasName" type="#String" many="true"/>
- <property name="name" type="#String"/>
- <property name="uri" type="#String"/>
- <property name="dataType" type="#Boolean"/>
- <property name="open" type="#Boolean"/>
- <property name="sequenced" type="#Boolean"/>
- <property name="abstract" type="#Boolean"/>
- </type>
-
- <type name="Property" open="true" uri="commonj.sdo">
- <property name="aliasName" type="#String" many="true"/>
- <property name="name" type="#String"/>
- <property name="many" type="#Boolean"/>
- <property name="containment" type="#Boolean"/>
- <property name="type" type="#Type" />
- <property name="default" type="#String"/>
- <property name="readOnly" type="#Boolean"/>
- <property name="opposite" type="#Property"/>
- </type>
-
- <!-- SDO special types -->
-
- <type name="DataObject" abstract="true" sdoJava:instanceClass="commonj.sdo.DataObject" uri="commonj.sdo"/>
- <type name="ObjectType" abstract="true" datatype="true" sdoJava:instanceClass="java.lang.Object" uri="commonj.sdo"/>
- <type name="ChangeSummaryType" abstract="true" datatype="true" sdoJava:instanceClass="commonj.sdo.ChangeSummary" uri="commonj.sdo"/>
-
- <type name="TextType" abstract="true">
- <property name="text" type="#String" many="true"/>
- </type>
-
- <!-- SDO data types -->
-
- <type name="Boolean" datatype="true" sdoJava:instanceClass="boolean" uri="commonj.sdo"/>
- <type name="Byte" datatype="true" sdoJava:instanceClass="byte" uri="commonj.sdo"/>
- <type name="Bytes" datatype="true" sdoJava:instanceClass="byte[]" uri="commonj.sdo"/>
- <type name="Character" datatype="true" sdoJava:instanceClass="char" uri="commonj.sdo"/>
- <type name="Date" datatype="true" sdoJava:instanceClass="java.util.Date" uri="commonj.sdo"/>
- <type name="DateTime" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
- <type name="Day" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
- <type name="Decimal" datatype="true" sdoJava:instanceClass="java.math.BigDecimal" uri="commonj.sdo"/>
- <type name="Duration" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
- <type name="Double" datatype="true" sdoJava:instanceClass="double" uri="commonj.sdo"/>
- <type name="Float" datatype="true" sdoJava:instanceClass="float" uri="commonj.sdo"/>
- <type name="Int" datatype="true" sdoJava:instanceClass="int" uri="commonj.sdo"/>
- <type name="Integer" datatype="true" sdoJava:instanceClass="java.math.BigInteger" uri="commonj.sdo"/>
- <type name="Long" datatype="true" sdoJava:instanceClass="long" uri="commonj.sdo"/>
- <type name="MonthDay" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
- <type name="Month" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
- <type name="Short" datatype="true" sdoJava:instanceClass="short" uri="commonj.sdo"/>
- <type name="String" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
- <type name="Strings" datatype="true" sdoJava:instanceClass="java.util.List" uri="commonj.sdo"/>
- <type name="Time" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
- <type name="Year" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
- <type name="YearMonth" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
- <type name="YearMonthDay" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
- <type name="URI" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-
-</types>
diff --git a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoModel.xsd b/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoModel.xsd
deleted file mode 100644
index a041c9e02b..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoModel.xsd
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
-
--->
-
-<xsd:schema
- targetNamespace="commonj.sdo"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sdo="commonj.sdo"
- xmlns:sdoXML="commonj.sdo/xml"
- xmlns:sdoJava="commonj.sdo/java"
- elementFormDefault="qualified"
- xsi:schemaLocation="commonj.sdo/xml sdoXML.xsd
- commonj.sdo/java sdoJava.xsd">
-
-<xsd:include schemaLocation="datagraph.xsd"/>
-
-<!-- Root element for defining several Types in one document.
- Is not part of the model.
--->
-<xsd:element name="types" type="sdo:Types"/>
-<xsd:complexType name="Types">
- <xsd:sequence>
- <xsd:element name="type" type="sdo:Type" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
-</xsd:complexType>
-
-<!-- Any data object may be serialized with this element,
- with xsi:type to declare the
- actual type of the DataObject serialized.
--->
-<xsd:element name="dataObject" type="xsd:anyType"/>
-
-<!-- Model Types
- SDO Type and Property are defined in terms of themselves.
--->
-<xsd:element name="type" type="sdo:Type"/>
-<xsd:complexType name="Type">
- <xsd:sequence>
- <xsd:element name="baseType" type="sdo:URI"
- minOccurs="0" maxOccurs="unbounded"
- sdoXML:propertyType="sdo:Type" />
- <xsd:element name="property" type="sdo:Property"
- minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="aliasName" type="sdo:String"
- minOccurs="0" maxOccurs="unbounded" />
- <xsd:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:ID" sdo:dataType="sdo:String"/>
- <xsd:attribute name="uri" type="sdo:URI"/>
- <xsd:attribute name="dataType" type="sdo:Boolean"/>
- <xsd:attribute name="open" type="sdo:Boolean"/>
- <xsd:attribute name="sequenced" type="sdo:Boolean"/>
- <xsd:attribute name="abstract" type="sdo:Boolean"/>
- <xsd:anyAttribute namespace="##any" processContents="lax"/>
-</xsd:complexType>
-
-<xsd:complexType name="Property">
- <xsd:sequence>
- <xsd:element name="aliasName" type="sdo:String"
- minOccurs="0" maxOccurs="unbounded" />
- <xsd:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </xsd:sequence>
- <xsd:attribute name="name" type="sdo:String"/>
- <xsd:attribute name="many" type="sdo:Boolean"/>
- <xsd:attribute name="containment" type="sdo:Boolean"/>
- <xsd:attribute name="default" type="sdo:String"/>
- <xsd:attribute name="readOnly" type="sdo:Boolean"/>
- <xsd:attribute name="type" type="sdo:URI" sdoXML:propertyType="sdo:Type" />
- <xsd:attribute name="opposite" type="sdo:URI" sdoXML:propertyType="sdo:Property" />
- <xsd:anyAttribute namespace="##any" processContents="lax"/>
-</xsd:complexType>
-
-<!-- Special Types -->
-<xsd:complexType name="DataObject" abstract="true"/>
-
-<xsd:complexType name="TextType" abstract="true">
- <xsd:sequence>
- <xsd:element name="text" minOccurs="0" maxOccurs="unbounded" type="xsd:string"/>
- </xsd:sequence>
-</xsd:complexType>
-
-<!-- ChangeSummaryType is defined in datagraph.xsd.
- Although declared there as a ComplexType,
- at the model level it is treated as a SimpleType
- with a special XML serialization.
--->
-
-
-<!-- Data Types -->
-<xsd:simpleType name="Boolean" sdoJava:instanceClass="boolean">
- <xsd:restriction base="xsd:boolean"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Byte" sdoJava:instanceClass="byte">
- <xsd:restriction base="xsd:byte"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Bytes" sdoJava:instanceClass="byte[]">
- <xsd:restriction base="xsd:hexBinary"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Character" sdoJava:instanceClass="char">
- <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Date" sdoJava:instanceClass="java.util.Date">
- <xsd:restriction base="xsd:dateTime"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="DateTime" sdoJava:instanceClass="java.lang.String">
- <xsd:restriction base="xsd:dateTime"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Day" sdoJava:instanceClass="java.lang.String">
- <xsd:restriction base="xsd:gDay"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Decimal" sdoJava:instanceClass="java.math.BigDecimal">
- <xsd:restriction base="xsd:decimal"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Double" sdoJava:instanceClass="double">
- <xsd:restriction base="xsd:double"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Duration" sdoJava:instanceClass="java.lang.String">
- <xsd:restriction base="xsd:duration"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Float" sdoJava:instanceClass="float">
- <xsd:restriction base="xsd:float"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Int" sdoJava:instanceClass="int">
- <xsd:restriction base="xsd:int"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Integer" sdoJava:instanceClass="java.math.BigInteger">
- <xsd:restriction base="xsd:integer"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Long" sdoJava:instanceClass="long">
- <xsd:restriction base="xsd:long"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Month" sdoJava:instanceClass="java.lang.String">
- <xsd:restriction base="xsd:gMonth"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="MonthDay" sdoJava:instanceClass="java.lang.String">
- <xsd:restriction base="xsd:gMonthDay"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Object" sdoJava:instanceClass="java.lang.Object">
- <!-- Only the schema for schemas is allowed to restrict anySimpleType.
- <xsd:restriction base="xsd:anySimpleType"/>
- The equivalent declaration is a union of the predefined XSD data types.
- -->
- <xsd:union memberTypes="xsd:anyURI xsd:base64Binary xsd:boolean xsd:byte
- xsd:date xsd:dateTime xsd:decimal xsd:double xsd:duration xsd:ENTITIES xsd:ENTITY xsd:float
- xsd:gDay xsd:gMonth xsd:gMonthDay xsd:gYear xsd:gYearMonth xsd:hexBinary xsd:ID xsd:IDREF xsd:IDREFS
- xsd:int xsd:integer xsd:language xsd:long xsd:Name xsd:NCName xsd:negativeInteger
- xsd:NMTOKEN xsd:NMTOKENS xsd:nonNegativeInteger xsd:nonPositiveInteger
- xsd:normalizedString xsd:NOTATION xsd:positiveInteger xsd:QName xsd:short xsd:string
- xsd:time xsd:token xsd:unsignedByte xsd:unsignedInt xsd:unsignedLong xsd:unsignedShort"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Short" sdoJava:instanceClass="short">
- <xsd:restriction base="xsd:short"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="String" sdoJava:instanceClass="java.lang.String">
- <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Strings" sdoJava:instanceClass="java.util.List">
- <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Time" sdoJava:instanceClass="java.lang.String">
- <xsd:restriction base="xsd:time"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Year" sdoJava:instanceClass="java.lang.String">
- <xsd:restriction base="xsd:gYear"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="YearMonth" sdoJava:instanceClass="java.lang.String">
- <xsd:restriction base="xsd:gYearMonth"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="YearMonthDay" sdoJava:instanceClass="java.lang.String">
- <xsd:restriction base="xsd:date"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="URI" sdoJava:instanceClass="java.lang.String">
- <xsd:restriction base="xsd:anyURI"/>
-</xsd:simpleType>
-
-</xsd:schema> \ No newline at end of file
diff --git a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoXML.xml b/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoXML.xml
deleted file mode 100644
index ac831576fb..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoXML.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
--->
-
-<types xmlns="commonj.sdo"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sdoXML="commonj.sdo/xml"
- xsi:schemaLocation="commonj.sdo sdoModel.xsd commonj.sdo/java sdoJava.xsd commonj.sdo/xml sdoXML.xsd">
-
-<!--
- XMLInfo declares properties used in open content for
- the XML binding of SDO Types and Properties.
--->
-
- <type name="XMLInfo" uri="commonj.sdo/xml">
- <property name="xmlElement" type="commonj.sdo#Boolean"/>
- </type>
-
-</types>
diff --git a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoXML.xsd b/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoXML.xsd
deleted file mode 100644
index 88fc7daaf6..0000000000
--- a/branches/java-M1/java/spec/sdo/src/main/resources/xml/sdoXML.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
- *
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
- *
- * </copyright>
- *
- */
--->
-
-<xsd:schema
- targetNamespace="commonj.sdo/xml"
- xmlns:sdo="commonj.sdo"
- xmlns:sdoXML="commonj.sdo/xml"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-<xsd:import namespace="commonj.sdo" schemaLocation="sdoModel.xsd"/>
-
-
-<!--
- These attributes are used to customize the XSD mapping of SDO Types and Properties.
--->
-
-<xsd:attribute name="name" type="xsd:string" />
-<xsd:attribute name="propertyType" type="xsd:QName" />
-<xsd:attribute name="oppositeProperty" type="xsd:string" />
-<xsd:attribute name="sequence" type="xsd:boolean" />
-<xsd:attribute name="string" type="xsd:boolean" />
-<xsd:attribute name="dataType" type="xsd:QName" />
-<xsd:attribute name="aliasName" type="xsd:string" />
-<xsd:attribute name="readOnly" type="xsd:boolean" />
-
-<!--
- XMLInfo declares properties used in open content for
- the XML binding of SDO Types and Properties.
--->
-
-<xsd:complexType name="XMLInfo">
- <xsd:attribute name="xmlElement" type="sdo:Boolean"/>
-</xsd:complexType>
-
-</xsd:schema>
diff --git a/branches/java-M1/java/spec/sdo/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java b/branches/java-M1/java/spec/sdo/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java
deleted file mode 100644
index 8854e936b7..0000000000
--- a/branches/java-M1/java/spec/sdo/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- *
- * Copyright 2005 International Business Machines Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package commonj.sdo.impl;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import junit.framework.TestCase;
-import test.DefaultHelperProvider;
-import test.TCCL1HelperProvider;
-
-/**
- * @version $Revision$ $Date$
- */
-public class HelperProviderTestCase extends TestCase {
- private URL classes;
- private URL testClasses;
- private URL def;
- private URL tccl1;
-
- public void testInstanceIsNullWithNoImplementation() throws Exception {
- assertNull(HelperProvider.INSTANCE);
- }
-
- public void testDefaultInstance() throws Exception {
- ClassLoader cl = new URLClassLoader(new URL[]{classes, def, testClasses}, null);
- Class providerClass = cl.loadClass(HelperProvider.class.getName());
- Class implClass = cl.loadClass(DefaultHelperProvider.class.getName());
- Object instance = providerClass.getField("INSTANCE").get(null);
- assertNotNull(instance);
- assertEquals(implClass, instance.getClass());
- }
-
- public void testLocateFromClassLoader() throws Exception {
- ClassLoader cl = new URLClassLoader(new URL[]{classes, tccl1, testClasses}, null);
- Class providerClass = cl.loadClass(HelperProvider.class.getName());
- Object provider = providerClass.getMethod("getInstance", new Class[] {ClassLoader.class})
- .invoke(null, new Object[] {cl});
- assertNotNull(provider);
- assertEquals(TCCL1HelperProvider.class.getName(), provider.getClass().getName());
- }
-
- public void testThreadContextInstance() throws Exception {
- ClassLoader cl = new URLClassLoader(new URL[]{classes, tccl1, testClasses}, null);
- ClassLoader tccl = Thread.currentThread().getContextClassLoader();
- try {
- Thread.currentThread().setContextClassLoader(cl);
- Class providerClass = cl.loadClass(HelperProvider.class.getName());
- Object provider = providerClass.getMethod("getInstance", new Class[0]).invoke(null, new Object[0]);
- assertNotNull(provider);
- assertEquals(TCCL1HelperProvider.class.getName(), provider.getClass().getName());
- } finally {
- Thread.currentThread().setContextClassLoader(tccl);
- }
-
- }
-
- public void testSystemProperty() {
- System.setProperty("commonj.sdo.impl.HelperProvider", "test.TCCL1HelperProvider");
- try {
- HelperProvider provider = HelperProvider.getInstance();
- assertNotNull(provider);
- assertEquals(TCCL1HelperProvider.class, provider.getClass());
- } finally {
- System.getProperties().remove("commonj.sdo.impl.HelperProvider");
- }
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- classes = new URL(HelperProvider.class.getResource("HelperProvider.class"), "../../..");
- testClasses = new URL(HelperProviderTestCase.class.getResource("HelperProviderTestCase.class"), "../../..");
- tccl1 = new URL(testClasses, "tccl1/");
- def = new URL(testClasses, "default/");
- }
-}
diff --git a/branches/java-M1/java/spec/sdo/src/test/java/test/DefaultHelperProvider.java b/branches/java-M1/java/spec/sdo/src/test/java/test/DefaultHelperProvider.java
deleted file mode 100644
index 96e8754a34..0000000000
--- a/branches/java-M1/java/spec/sdo/src/test/java/test/DefaultHelperProvider.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- *
- * Copyright 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test;
-
-import commonj.sdo.impl.HelperProvider;
-import commonj.sdo.impl.ExternalizableDelegator;
-import commonj.sdo.helper.CopyHelper;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.DataHelper;
-import commonj.sdo.helper.EqualityHelper;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * @version $Revision$ $Date$
- */
-public class DefaultHelperProvider extends HelperProvider {
- public CopyHelper copyHelper() {
- throw new UnsupportedOperationException();
- }
-
- public DataFactory dataFactory() {
- throw new UnsupportedOperationException();
- }
-
- public DataHelper dataHelper() {
- throw new UnsupportedOperationException();
- }
-
- public EqualityHelper equalityHelper() {
- throw new UnsupportedOperationException();
- }
-
- public TypeHelper typeHelper() {
- throw new UnsupportedOperationException();
- }
-
- public XMLHelper xmlHelper() {
- throw new UnsupportedOperationException();
- }
-
- public XSDHelper xsdHelper() {
- throw new UnsupportedOperationException();
- }
-
- public ExternalizableDelegator.Resolvable resolvable() {
- throw new UnsupportedOperationException();
- }
-
- public ExternalizableDelegator.Resolvable resolvable(Object target) {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/branches/java-M1/java/spec/sdo/src/test/java/test/TCCL1HelperProvider.java b/branches/java-M1/java/spec/sdo/src/test/java/test/TCCL1HelperProvider.java
deleted file mode 100644
index 0055e00002..0000000000
--- a/branches/java-M1/java/spec/sdo/src/test/java/test/TCCL1HelperProvider.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- *
- * Copyright 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test;
-
-import commonj.sdo.impl.HelperProvider;
-import commonj.sdo.impl.ExternalizableDelegator;
-import commonj.sdo.helper.CopyHelper;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.DataHelper;
-import commonj.sdo.helper.EqualityHelper;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * @version $Revision$ $Date$
- */
-public class TCCL1HelperProvider extends HelperProvider {
- public CopyHelper copyHelper() {
- throw new UnsupportedOperationException();
- }
-
- public DataFactory dataFactory() {
- throw new UnsupportedOperationException();
- }
-
- public DataHelper dataHelper() {
- throw new UnsupportedOperationException();
- }
-
- public EqualityHelper equalityHelper() {
- throw new UnsupportedOperationException();
- }
-
- public TypeHelper typeHelper() {
- throw new UnsupportedOperationException();
- }
-
- public XMLHelper xmlHelper() {
- throw new UnsupportedOperationException();
- }
-
- public XSDHelper xsdHelper() {
- throw new UnsupportedOperationException();
- }
-
- public ExternalizableDelegator.Resolvable resolvable() {
- throw new UnsupportedOperationException();
- }
-
- public ExternalizableDelegator.Resolvable resolvable(Object target) {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/branches/java-M1/java/spec/sdo/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider b/branches/java-M1/java/spec/sdo/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider
deleted file mode 100644
index 5175e5abea..0000000000
--- a/branches/java-M1/java/spec/sdo/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider
+++ /dev/null
@@ -1,3 +0,0 @@
-# test comment and blank line
-
- test.DefaultHelperProvider # comment
diff --git a/branches/java-M1/java/spec/sdo/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider b/branches/java-M1/java/spec/sdo/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider
deleted file mode 100644
index c7f46ba91e..0000000000
--- a/branches/java-M1/java/spec/sdo/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider
+++ /dev/null
@@ -1 +0,0 @@
-test.TCCL1HelperProvider \ No newline at end of file