Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk

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

4 files changed, 0 insertions, 347 deletions

diff --git a/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessorTestCase.java b/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessorTestCase.java
deleted file mode 100644
index 8659280891..0000000000
--- a/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessorTestCase.java
+++ /dev/null
@@ -1,179 +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.sca.implementation.das;
-
-import java.io.StringReader;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.data.engine.config.ConnectionInfo;
-import org.apache.tuscany.sca.data.engine.config.ConnectionProperties;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DASImplementationProcessorTestCase extends TestCase {
-    
-    protected static final QName IMPLEMENTATION_DAS = new QName(Constants.SCA10_TUSCANY_NS, "implementation.das");
-
-    private static final String COMPOSITE_USING_DATASOURCE =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\" targetNamespace=\"http://data\" name=\"data\">"
-            + " <component name=\"DasComponent\">"
-            + "   <tuscany:implementation.das config=\"config.xml\" dataAccessType=\"rdb\">"
-            + "      <tuscany:connectionInfo datasource=\"dataSource\"/>"
-            + "   </tuscany:implementation.das>"
-            + "</component>";
-
-    private static final String COMPOSITE_USING_CONNECTION_PROPERTIES =            
-            "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\" targetNamespace=\"http://data\" name=\"data\">"
-            + " <component name=\"DasComponent\">"
-            + "   <tuscany:implementation.das config=\"config.xml\" dataAccessType=\"rdb\">"
-            + "      <tuscany:connectionInfo>"
-            + "         <tuscany:connectionProperties"
-            + "            driverClass=\"driverClass\""
-            + "            databaseURL=\"databaseURL\""
-            + "            loginTimeout=\"1\"/>"
-            + "      </tuscany:connectionInfo>"
-            + "   </tuscany:implementation.das>"
-            + "</component>";
-    
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\" targetNamespace=\"http://data\" name=\"data\">"
-            + " <component name=\"DasComponent\">"
-            + "   <tuscany:implementation.das>"
-            + "      <tuscany:connectionInfo datasource=\"dataSource\"/>"
-            + "   </tuscany:implementation.das>"
-            + "</component>";
-
-    private XMLInputFactory xmlFactory;
-    private ModelFactoryExtensionPoint modelFactories;
-    private Monitor monitor;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        xmlFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
-        if (monitorFactory != null) 
-        	this.monitor = monitorFactory.createMonitor();
-        modelFactories = new DefaultModelFactoryExtensionPoint();
-        AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
-        modelFactories.addFactory(assemblyFactory);
-        JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
-        modelFactories.addFactory(javaFactory);
-    }
-
-    public void testLoadCompositeUsingDatasource() throws Exception {
-        XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(COMPOSITE_USING_DATASOURCE));
-        
-        DASImplementationProcessor dataProcessor = new DASImplementationProcessor(modelFactories, monitor);
-        
-        while(true) {
-            int event = reader.next();
-            if(event == XMLStreamConstants.START_ELEMENT && IMPLEMENTATION_DAS.equals(reader.getName())) {
-                break;
-            }
-        }
-
-        DASImplementation implementation = dataProcessor.read(reader);
-        
-        assertNotNull(implementation);
-        assertEquals("config.xml", implementation.getConfig());
-        assertEquals("rdb", implementation.getDataAccessType());
-
-        ConnectionInfo connInfo = implementation.getConnectionInfo();
-        assertNotNull(connInfo);
-        assertEquals("dataSource", connInfo.getDataSource());
-        
-        ConnectionProperties connProperties = connInfo.getConnectionProperties();
-        assertNull(connProperties);
-    }
-
-    public void testLoadCompositeUsingConnectionProperties() throws Exception {
-        XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(COMPOSITE_USING_CONNECTION_PROPERTIES));
-
-        DASImplementationProcessor dataProcessor = new DASImplementationProcessor(modelFactories, monitor);
-        
-        while(true) {
-            int event = reader.next();
-            if(event == XMLStreamConstants.START_ELEMENT && IMPLEMENTATION_DAS.equals(reader.getName())) {
-                break;
-            }
-        }
-
-        DASImplementation implementation = dataProcessor.read(reader);
-        
-        assertNotNull(implementation);
-        assertEquals("config.xml", implementation.getConfig());
-        assertEquals("rdb", implementation.getDataAccessType());
-
-        ConnectionInfo connInfo = implementation.getConnectionInfo();
-        assertNotNull(connInfo);
-        assertNull("dataSource", connInfo.getDataSource());
-        
-        ConnectionProperties connProperties = connInfo.getConnectionProperties();
-        assertNotNull(connProperties);
-        assertEquals("driverClass",connProperties.getDriverClass());
-        assertEquals("databaseURL",connProperties.getDatabaseURL());
-        assertEquals(1,connProperties.getLoginTimeout().intValue());
-    }
-    
-    /**
-     * Test loading an INVALID implementation.das element from a contribution metadata stream
-     */
-    public void testLoadInvalid() throws Exception {
-        XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(INVALID_XML));
-        
-        DASImplementationProcessor dataProcessor = new DASImplementationProcessor(modelFactories, monitor);
-        
-        while(true) {
-            int event = reader.next();
-            if(event == XMLStreamConstants.START_ELEMENT && IMPLEMENTATION_DAS.equals(reader.getName())) {
-                break;
-            }
-        }
-
-        dataProcessor.read(reader);        
-        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();         
-        assertNotNull(problem);
-        assertEquals("DataAccessTypeAttributeMissing", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java b/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java
deleted file mode 100644
index 7d8b4181c1..0000000000
--- a/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java
+++ /dev/null
@@ -1,73 +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.sca.implementation.das;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-import commonj.sdo.DataObject;

-

-/**

- * Tests the DAS service

- * 

- * @version $Rev$ $Date$

- */

-public class DASTestCase extends TestCase {

-

-    private SCADomain scaDomain;

-    private DAS dasService;

-    

-    /**

-     * @throws java.lang.Exception

-     */

-    @Override

-    protected void setUp() throws Exception {

-        scaDomain = SCADomain.newInstance("das.composite");

-        dasService = scaDomain.getService(DAS.class, "DASServiceComponent/DAS");

-

-    }

-

-    /**

-     * @throws java.lang.Exception

-     */

-    @Override

-    protected void tearDown() throws Exception {

-        scaDomain.close();

-    }

-

-    

-    public void testExecuteCommand() throws Exception {

-        String commandName = "all companies";

-         

-        DataObject resultRoot= dasService.executeCommand(commandName);

-        assertNotNull(resultRoot);    

-        assertEquals(3, resultRoot.getList("COMPANY").size());

-    }

-    

-    public void testExecuteCommandWithFilter() throws Exception {

-        String commandName = "all companies";

-         

-        DataObject resultRoot= dasService.executeCommand(commandName, "COMPANY[1]");

-        assertNotNull(resultRoot);        

-    }

-

-

-}

diff --git a/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyService.java b/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyService.java
deleted file mode 100644
index 63d0c92683..0000000000
--- a/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyService.java
+++ /dev/null
@@ -1,33 +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.sca.implementation.das.company;

-

-import org.apache.tuscany.sca.implementation.das.annotations.Command;

-

-import commonj.sdo.DataObject;

-

-/**

- * 

- * @version $Rev$ $Date$

- */

-public interface CompanyService {

-    @Command(query="select * from COMPANY")

-    DataObject getCompanies();

-}

diff --git a/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java b/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java
deleted file mode 100644
index 565a930ebe..0000000000
--- a/branches/sca-java-1.5/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java
+++ /dev/null
@@ -1,62 +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.sca.implementation.das.company;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-import commonj.sdo.DataObject;

-

-/**

- * Tests the DAS service

- *

- * @version $Rev$ $Date$

- */

-public class CompanyServiceTestCase extends TestCase {

-

-    private SCADomain scaDomain;

-    private CompanyService dasCompanyService;

-    

-    /**

-     * @throws java.lang.Exception

-     */

-    @Override

-    protected void setUp() throws Exception {

-        scaDomain = SCADomain.newInstance("company.composite");

-        dasCompanyService = scaDomain.getService(CompanyService.class, "CompanyServiceComponent/CompanyService");

-    }

-

-    /**

-     * @throws java.lang.Exception

-     */

-    @Override

-    protected void tearDown() throws Exception {

-        scaDomain.close();

-    }

-    

-    public void testGetCompanies() throws Exception {

-        DataObject root = dasCompanyService.getCompanies();

-        assertNotNull(root);

-        String nome = root.getString("COMPANY[1]/NAME");

-        assertEquals("ACME Publishing", root.getString("COMPANY[1]/NAME"));

-    }

-

-}