Moving 1.x trunk

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

7 files changed, 0 insertions, 266 deletions

diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index 76fa697c6a..0000000000
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ /dev/null
@@ -1,18 +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. 

-

-itest.SomeCustomModelResolver;model=org.apache.tuscany.sca.contribution.jee.ExternalEarInfo

diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index eb0811dcc6..0000000000
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation extension

-itest.MockImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.jee.JEEImplementation

diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/test.composite b/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/test.composite
deleted file mode 100644
index 38902f1f1d..0000000000
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/test.composite
+++ /dev/null
@@ -1,31 +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.    

--->

-

-<!-- $Rev: 685124 $ $Date: 2008-08-12 12:46:19 +0100 (Tue, 12 Aug 2008) $ -->

-

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	targetNamespace="http://sample/jee"

-	xmlns:sc="http://sample/composite"

-	name="TestJEE">

-

-    <component name="TestJEE">

-        <implementation.jee archive="../contribution-jee/src/test/resources/repository/helloworld-ejb.ear"/>

-    </component>

-</composite>

diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java b/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
deleted file mode 100644
index c1eae6a64d..0000000000
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
+++ /dev/null
@@ -1,25 +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 itest;

-

-public interface Helloworld {

-

-    String getGreetings(String name);

-}

diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java b/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
deleted file mode 100644
index 765e6a3f18..0000000000
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
+++ /dev/null
@@ -1,52 +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 itest;

-

-import static org.junit.Assert.assertEquals;

-

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

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-

-/**

- */

-public class JeeTestCase {

-

-

-    @Before

-    public void init() {

-    }

-

-    @Test

-    public void testSayHello() throws Exception {

-        SCADomain scaDomain = SCADomain.newInstance("http://localhost", "/", "test.composite");

-

-        Helloworld service = scaDomain.getService(Helloworld.class, "TestJEE/HelloworldServiceBean_HelloworldService");

-

-        //assertEquals("hello beate", service.getGreetings("beate"));

-

-        scaDomain.close();

-    }

-

-    @After

-    public void end() {

-    }

-}

diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java b/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
deleted file mode 100644
index 7f7cff8810..0000000000
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
+++ /dev/null
@@ -1,44 +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 itest;

-

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.implementation.jee.JEEImplementation;

-import org.apache.tuscany.sca.provider.ImplementationProvider;

-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-

-public class MockImplementationProviderFactory implements ImplementationProviderFactory<JEEImplementation>{

-

-    public MockImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {

-        

-    }

-

-    

-    public ImplementationProvider createImplementationProvider(RuntimeComponent component,

-                                                               JEEImplementation Implementation) {

-        return null;

-    }

-

-    public Class<JEEImplementation> getModelType() {

-        return null;

-    }

-

-}

diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java b/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java
deleted file mode 100644
index b534297148..0000000000
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java
+++ /dev/null
@@ -1,77 +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 itest;

-

-import java.io.File;

-import java.net.URI;

-import java.util.HashMap;

-import java.util.Map;

-

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo;

-import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;

-import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-

-public class SomeCustomModelResolver implements ModelResolver {

-

-    private Map<URI, ExternalEarInfo> map = new HashMap<URI, ExternalEarInfo>();

-    private JavaEEIntrospector jeeIntrospector;

-    

-    

-    public SomeCustomModelResolver(Contribution contribution, ExtensionPointRegistry extensionPoints) {

-       jeeIntrospector = extensionPoints.getExtensionPoint(JavaEEIntrospector.class);

-    }

-        

-    public void addModel(Object resolved) {

-        ExternalEarInfo jeeApp = (ExternalEarInfo)resolved;

-        map.put(jeeApp.getAppInfo().getUri(), jeeApp);

-    }

-

-    public Object removeModel(Object resolved) {

-        return map.remove(((ExternalEarInfo)resolved).getAppInfo().getUri());

-    }

-

-    public <T> T resolveModel(final Class<T> modelClass, T unresolved) {

-        URI uri = ((ExternalEarInfo)unresolved).getAppInfo().getUri();

-        if (uri != null) {

-            ExternalEarInfo resolved = (ExternalEarInfo) map.get(uri);

-            if (resolved != null) {

-                return modelClass.cast(resolved);

-            } else {

-                try {

-                    File f = new File(uri.toString());

-                    final JavaEEApplicationInfo o = jeeIntrospector.introspectJeeArchive(f.toURI().toURL());

-                    return (T)new ExternalEarInfo() {

-                        public JavaEEApplicationInfo getAppInfo() {

-                            return (JavaEEApplicationInfo)o;

-                        }

-                    };

-                } catch (Exception e) {

-                    throw new RuntimeException(e);

-                }

-            }

-        }

-

-        return unresolved;

-    }

-

-}