moving SDO branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@834614 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 0 insertions, 880 deletions

diff --git a/branches/sdo-1.1-incubating/plugin/pom.xml b/branches/sdo-1.1-incubating/plugin/pom.xml
deleted file mode 100644
index 6adda49119..0000000000
--- a/branches/sdo-1.1-incubating/plugin/pom.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.apache.tuscany.sdo</groupId>
-        <artifactId>tuscany-sdo</artifactId>
-        <version>1.1-incubating</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>tuscany-sdo-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>Tuscany SDO Maven Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>2.0.4</version>
-            <scope>compile</scope>
-        </dependency>
-	<dependency>
-	    <groupId>org.apache.maven</groupId>
-	    <artifactId>maven-model</artifactId>
-	    <version>2.0.4</version>
-	</dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-project</artifactId>
-            <version>2.0.4</version>
-            <scope>compile</scope>
-        </dependency>       
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-descriptor</artifactId>
-            <version>2.0.4</version>
-            <scope>compile</scope>
-        </dependency>                
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-api-r${specVersion}</artifactId>
-            <version>1.1-incubating</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-tools</artifactId>
-            <version>${sdo.version}</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                  <archive>
-                     <manifestEntries>
-                        <X-Compile-Source-JDK>1.4</X-Compile-Source-JDK>
-                        <X-Compile-Target-JDK>1.4</X-Compile-Target-JDK>
-                     </manifestEntries>
-                  </archive>
-               </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Extension-Name>${project.artifactId}</Extension-Name>
-                            <Specification-Title>${project.name}</Specification-Title>
-                            <Specification-Vendor>${project.organization.name}</Specification-Vendor>
-                            <Specification-Version>${version}</Specification-Version>
-                            <Implementation-Title>${project.artifactId}</Implementation-Title>
-                            <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
-                            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/branches/sdo-1.1-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java b/branches/sdo-1.1-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
deleted file mode 100644
index 87323cb495..0000000000
--- a/branches/sdo-1.1-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.tuscany.sdo.plugin;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginExecution;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.project.MavenProject;
-import org.apache.tuscany.sdo.generate.JavaGenerator;
-import org.apache.tuscany.sdo.generate.XSD2JavaGenerator;
-
-/**
- * @version $Rev$ $Date$
- * @goal generate
- * @phase generate-sources
- * @description Generate SDO interface classes from an XML Schema
- */
-public class GeneratorMojo extends AbstractMojo {
-    /**
-     * The directory containing schema files; defaults to
-     * ${basedir}/src/main/xsd
-     * 
-     * @parameter expression="${basedir}/src/main/xsd"
-     */
-    private String schemaDir;
-
-    /**
-     * Name of the schema file; if omitted all files in the directory are
-     * processed
-     * 
-     * @parameter
-     */
-    private File schemaFile;
-
-    /**
-     * The Java package to generate into. By default the value is derived from
-     * the schema URI.
-     * 
-     * @parameter
-     */
-    private String javaPackage;
-
-    /**
-     * The directory to generate into; defaults to
-     * ${project.build.directory}/sdo-source
-     * 
-     * @parameter expression="${project.build.directory}/sdo-source"
-     */
-    private String targetDirectory;
-
-    /**
-     * Specifies the prefix string to use for naming the generated factory.
-     * 
-     * @parameter
-     */
-    private String prefix;
-
-    /**
-     * This option can be used to eliminate the generated interface and to
-     * generate only an implementation class.
-     * 
-     * @parameter
-     */
-    private Boolean noInterfaces;
-
-    /**
-     * Turns off container management for containment properties.
-     * 
-     * @parameter
-     */
-    private Boolean noContainment;
-
-    /**
-     * This option eliminates all change notification overhead in the generated
-     * classes.
-     * 
-     * @parameter
-     */
-    private Boolean noNotification;
-
-    /**
-     * With this option, all generated properties will not record their unset
-     * state.
-     * 
-     * @parameter
-     */
-    private Boolean noUnsettable;
-
-    /**
-     * Generate a fast XML parser/loader for instances of the model.
-     * 
-     * @parameter
-     */
-    private Boolean generateLoader;
-
-    /**
-     * Generate a Switch class for the model.
-     * 
-     * @parameter
-     */
-    private Boolean generateSwitch;
-
-    /**
-     * @parameter expression="${project}"
-     * @required
-     */
-    private MavenProject project;
-
-    /**
-     * @parameter expression="${plugin.mojos}"
-     */
-    private List mojos;
-
-    /**
-     * With this option, generated interfaces will extend
-     * commonj.sdo.DataObject.
-     * 
-     * @parameter
-     */
-    private Boolean interfaceDataObject;
-
-    /**
-     * Support for generating multiple schema files.
-     * 
-     * @parameter
-     */
-    private SchemaFileOption[] schemaFiles;
-    
-    /**
-     * The namespace to generate Java codes from.
-     * Setting to "all" will generate all namespaces.
-     * 
-     * @parameter
-     */
-    private String schemaNamespace;
-
-    public void execute() throws MojoExecutionException {
-
-        // check for schemaFiles parameter first, if properties are not set, use
-        // global property
-        if (null != schemaFiles) {
-            for (int i = 0; i < schemaFiles.length; ++i) {
-                SchemaFileOption sf = schemaFiles[i];
-
-                if (null == sf.getTargetDirectory()) {
-                    sf.setTargetDirectory(targetDirectory);
-                }
-                if (null == sf.getJavaPackage()) {
-                    sf.setJavaPackage(javaPackage);
-                }
-                if (null == sf.getSchemaNamespace()) {
-                	sf.setSchemaNamespace(schemaNamespace);
-                }
-                if (null == sf.isNoInterfaces()) {
-                    sf.setNoInterfaces(noInterfaces);
-                }
-                if (null == sf.isNoContainment()) {
-                    sf.setNoContainment(noContainment);
-                }
-                if (null == sf.isNoNotification()) {
-                    sf.setNoNotification(noNotification);
-                }
-                if (null == sf.isNoUnsettable()) {
-                    sf.setNoUnsettable(noUnsettable);
-                }
-                if (null == sf.isGenerateLoader()) {
-                    sf.setGenerateLoader(generateLoader);
-                }
-                if (null == sf.isGenerateSwitch()) {
-                    sf.setGenerateSwitch(generateSwitch);
-                }
-                // if (null == sf.getCompilerSourceRoots()) {
-                // sf.setCompilerSourceRoots(compileSourceRoots);
-                // }
-                if (null == sf.isInterfaceDataObject()) {
-                    sf.setInterfaceDataObject(interfaceDataObject);
-                }
-                if (sf.getFileName() == null || sf.getFileName().length() == 0) {
-                    throw new MojoExecutionException("no fileName specfied for schema.");
-                }
-                if (!sf.getFileName().canRead() || !sf.getFileName().isFile()) {
-
-                    throw new MojoExecutionException("file can not be read:" + sf.getFileName());
-                }
-            }
-        } else {
-
-            if (schemaFile == null) {
-                File[] files = new File(schemaDir).listFiles(FILTER);
-                schemaFiles = new SchemaFileOption[files.length];
-                for (int i = files.length - 1; i > -1; --i) {
-                    schemaFiles[i] = new SchemaFileOption();
-                    schemaFiles[i].setFileName(files[i]);
-                    schemaFiles[i].setJavaPackage(javaPackage);
-                    // schemaFiles[i].setCompilerSourceRoots(compileSourceRoots);
-                    schemaFiles[i].setGenerateLoader(generateLoader);
-                    schemaFiles[i].setGenerateSwitch(generateSwitch);
-                    schemaFiles[i].setNoContainment(noContainment);
-                    schemaFiles[i].setInterfaceDataObject(interfaceDataObject);
-                    schemaFiles[i].setNoInterfaces(noInterfaces);
-                    schemaFiles[i].setNoNotification(noNotification);
-                    schemaFiles[i].setNoUnsettable(noUnsettable);
-                    schemaFiles[i].setPrefix(prefix);
-                    schemaFiles[i].setTargetDirectory(targetDirectory);
-                    schemaFiles[i].setSchemaNamespace(schemaNamespace);
-                }
-            } else {
-                schemaFiles = new SchemaFileOption[] {new SchemaFileOption()};
-                schemaFiles[0].setFileName(schemaFile);
-                schemaFiles[0].setJavaPackage(javaPackage);
-                // schemaFiles[0].setCompilerSourceRoots(compileSourceRoots);
-                schemaFiles[0].setGenerateLoader(generateLoader);
-                schemaFiles[0].setGenerateSwitch(generateSwitch);
-                schemaFiles[0].setNoContainment(noContainment);
-                schemaFiles[0].setInterfaceDataObject(interfaceDataObject);
-                schemaFiles[0].setNoInterfaces(noInterfaces);
-                schemaFiles[0].setNoNotification(noNotification);
-                schemaFiles[0].setNoUnsettable(noUnsettable);
-                schemaFiles[0].setPrefix(prefix);
-                schemaFiles[0].setTargetDirectory(targetDirectory);
-                schemaFiles[0].setSchemaNamespace(schemaNamespace);
-            }
-        }
-
-        for (int i = 0; i < schemaFiles.length; i++) {
-            File file = schemaFiles[i].getFileName();
-            File marker = new File(schemaFiles[i].getTargetDirectory(), ".gen#" + file.getName());
-            if (file.lastModified() > marker.lastModified()) {
-                getLog().info("Generating SDO interfaces from " + file);
-
-                int genOptions = 0;
-
-                if (schemaFiles[i].isNoInterfaces() != null && schemaFiles[i].isNoInterfaces().booleanValue()) {
-                    genOptions |= JavaGenerator.OPTION_NO_INTERFACES;
-                }
-                if (schemaFiles[i].isNoContainment() != null && schemaFiles[i].isNoContainment().booleanValue()) {
-                    genOptions |= JavaGenerator.OPTION_NO_CONTAINMENT;
-                }
-                if (schemaFiles[i].isNoNotification() != null && schemaFiles[i].isNoNotification().booleanValue()) {
-                    genOptions |= JavaGenerator.OPTION_NO_NOTIFICATION;
-                }
-                if (schemaFiles[i].isGenerateLoader() != null && schemaFiles[i].isGenerateLoader().booleanValue()) {
-                    genOptions |= JavaGenerator.OPTION_GENERATE_LOADER;
-                }
-                if (schemaFiles[i].isNoUnsettable() != null && schemaFiles[i].isNoUnsettable().booleanValue()) {
-                    genOptions |= JavaGenerator.OPTION_NO_UNSETTABLE;
-                }
-                if (schemaFiles[i].isGenerateSwitch() != null && schemaFiles[i].isGenerateSwitch().booleanValue()) {
-                    genOptions |= JavaGenerator.OPTION_GENERATE_SWITCH;
-                }
-                if (schemaFiles[i].isInterfaceDataObject() != null && schemaFiles[i].isInterfaceDataObject()
-                    .booleanValue()) {
-                    genOptions |= JavaGenerator.OPTION_INTERFACE_DO;
-                }
-
-                XSD2JavaGenerator.generateFromXMLSchema(file.toString(),
-                                                        schemaFiles[i].getSchemaNamespace(),
-                                                        schemaFiles[i].getTargetDirectory(),
-                                                        schemaFiles[i].getJavaPackage(),
-                                                        schemaFiles[i].getPrefix(),
-                                                        genOptions);
-            }
-            try {
-                marker.createNewFile();
-            } catch (IOException e) {
-                throw new MojoExecutionException(e.getMessage() + "'" + marker.getAbsolutePath() + "'", e);
-            }
-            marker.setLastModified(System.currentTimeMillis());
-        }
-
-        targetDirectory = targetDirectory.replace('/', File.separatorChar);
-
-        // FIXME: [rfeng] Workaround to figure out the current execution phase
-        MojoDescriptor descriptor = (MojoDescriptor)mojos.get(0);
-        PluginDescriptor pluginDescriptor = descriptor.getPluginDescriptor();
-        Map pluginMap = project.getBuild().getPluginsAsMap();
-        Plugin plugin = (Plugin)pluginMap.get(pluginDescriptor.getGroupId() + ":" + pluginDescriptor.getArtifactId());
-        // How to get the current execution id?
-        for (Iterator i = plugin.getExecutions().iterator(); i.hasNext();) {
-            PluginExecution execution = (PluginExecution)i.next();
-            String phase = execution.getPhase();
-            if (phase != null && phase.indexOf("-test-") != -1) {
-                project.addTestCompileSourceRoot(targetDirectory);
-            } else {
-                project.addCompileSourceRoot(targetDirectory);
-            }
-        }
-    }
-
-    private static final FileFilter FILTER = new FileFilter() {
-        public boolean accept(File pathname) {
-            return (pathname.isFile() || !pathname.isHidden());
-        }
-    };
-}
diff --git a/branches/sdo-1.1-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java b/branches/sdo-1.1-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
deleted file mode 100644
index ff3db1145f..0000000000
--- a/branches/sdo-1.1-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.tuscany.sdo.plugin;
-
-import java.io.File;
-
-public class SchemaFileOption {
-    
-    /**
-     * Name of the schema file
-     * 
-     * @parameter
-     */
-    private File fileName;
-    
-    /**
-     * The Java package to generate into. By default the value is derived from the schema URI.
-     * 
-     * @parameter
-     */
-    private String javaPackage;
-
-    /**
-     * The directory to generate into; defaults to ${project.build.directory}/sdo-source
-     * 
-     * @parameter expression="${project.build.directory}/sdo-source"
-     */
-    private String targetDirectory;
-
-    /**
-     * Specifies the prefix string to use for naming the generated factory.
-     * 
-     * @parameter
-     */
-    private String prefix;
-
-    /**
-     * This option can be used to eliminate the generated interface and to generate only an implementation class.
-     * 
-     * @parameter
-     */
-    private Boolean noInterfaces;
-
-    /**
-     * Turns off container management for containment properties.
-     * 
-     * @parameter
-     */
-    private Boolean noContainment;
-
-    /**
-     * This option eliminates all change notification overhead in the generated classes.
-     * 
-     * @parameter
-     */
-    private Boolean noNotification;
-
-    /**
-     * With this option, all generated properties will not record their unset state.
-     * 
-     * @parameter
-     */
-    private Boolean noUnsettable;
-
-    /**
-     * Generate a fast XML parser/loader for instances of the model.
-     * 
-     * @parameter
-     */
-    private Boolean generateLoader;
-
-    /**
-     * Generate a Switch class for the model.
-     * 
-     * @parameter
-     */
-    private Boolean generateSwitch;
-
-    /**
-     * With this option, generated interfaces will extend commonj.sdo.DataObject.
-     * 
-     * @parameter
-     */
-    private Boolean interfaceDataObject;
-
-    /**
-     * The namespace to generate Java codes from.
-     * Setting to "all" will generate all namespaces.
-     */
-    private String schemaNamespace;
-
-    public SchemaFileOption() {
-    }
-
-    public Boolean isGenerateLoader() {
-        return generateLoader;
-    }
-
-    public void setGenerateLoader(Boolean generateLoader) {
-        this.generateLoader = generateLoader;
-    }
-
-    public Boolean isGenerateSwitch() {
-        return generateSwitch;
-    }
-
-    public void setGenerateSwitch(Boolean generateSwitch) {
-        this.generateSwitch = generateSwitch;
-    }
-
-    public String getJavaPackage() {
-        return javaPackage;
-    }
-
-    public void setJavaPackage(String javaPackage) {
-        this.javaPackage = javaPackage;
-    }
-
-    public Boolean isNoContainment() {
-        return noContainment;
-    }
-
-    public void setNoContainment(Boolean noContainment) {
-        this.noContainment = noContainment;
-    }
-
-    public Boolean isNoInterfaces() {
-        return noInterfaces;
-    }
-
-    public void setNoInterfaces(Boolean noInterfaces) {
-        this.noInterfaces = noInterfaces;
-    }
-
-    public Boolean isNoNotification() {
-        return noNotification;
-    }
-
-    public void setNoNotification(Boolean noNotification) {
-        this.noNotification = noNotification;
-    }
-
-    public Boolean isNoUnsettable() {
-        return noUnsettable;
-    }
-
-    public void setNoUnsettable(Boolean noUnsettable) {
-        this.noUnsettable = noUnsettable;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-
-    public String getTargetDirectory() {
-        return targetDirectory;
-    }
-
-    public void setTargetDirectory(String targetDirectory) {
-        this.targetDirectory = targetDirectory;
-    }
-
-    public File getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(File fileName) {
-        this.fileName = fileName;
-    }
-
-	public Boolean isInterfaceDataObject() {
-		return interfaceDataObject;
-	}
-
-	public void setInterfaceDataObject(Boolean interfaceDataObject) {
-		this.interfaceDataObject = interfaceDataObject;
-	}
-	
-	public String getSchemaNamespace() {
-    	return schemaNamespace;
-    }
-	
-	public void setSchemaNamespace(String schemaNamespace) {
-		this.schemaNamespace = schemaNamespace;
-	}
-
-}
diff --git a/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/DISCLAIMER b/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/DISCLAIMER
deleted file mode 100644
index a65af91c5a..0000000000
--- a/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Tuscany is an effort undergoing incubation at The Apache Software

-Foundation (ASF), sponsored by the Apache 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.
\ No newline at end of file
diff --git a/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/LICENSE.txt b/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 9a90d375bc..0000000000
--- a/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,207 +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.
-
-
-
-
-
diff --git a/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/NOTICE b/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 9f9572a167..0000000000
--- a/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
diff --git a/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/README.txt b/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/README.txt
deleted file mode 100644
index 1b8144f7c5..0000000000
--- a/branches/sdo-1.1-incubating/plugin/src/main/resources/META-INF/README.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Apache Tuscany 1.1-incubating build (April 2008)
-================================================
-
-http://incubator.apache.org/tuscany/
-
-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. 
-