summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-13 01:25:44 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-13 01:25:44 +0000
commitb5c0d648cf147d3709eb78d98011f38e07aee723 (patch)
treee82891caaa5b04b3551ef59d1c790fddd99d5131 /branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org
parent539451c7e13d98504e6f3368d892406494ca711d (diff)
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835694 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org')
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java56
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java39
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java39
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java70
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java33
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java29
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java31
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java38
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java70
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java38
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java34
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java41
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java30
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java32
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.java73
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebImplementationGenerated.java43
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java50
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java70
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java77
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedProcessor.java67
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java158
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java69
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java66
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java68
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java59
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java262
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java359
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java51
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java36
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java59
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedImpl.java60
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedProcessor.java66
-rw-r--r--branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java109
33 files changed, 0 insertions, 2382 deletions
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java
deleted file mode 100644
index 770fb08279..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java
+++ /dev/null
@@ -1,56 +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.contribution.jee;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-
-
-
-/**
- * The model representing an EJB implementation in an SCA assembly model when the
- * EJB implementation has been generated by introspecting a non-enhanced EAR
- */
-public interface EJBImplementationGenerated extends Implementation {
-
- /**
- * Return the EjbInfo which generated this EJB component implementation
- * @return
- */
- EjbInfo getEJBInfo();
-
- /**
- * Set the EjbInfo which generated this EJB component implementation
- * @param ejbInfo
- */
- void setEJBInfo(EjbInfo ejbInfo);
-
- /**
- * return the EjbModuleInfo which contains the EJB Info used to generate this object
- *
- * @return
- */
- EjbModuleInfo getEjbModuleInfo();
-
- /**
- * Set the EjbModuleInfo which contains the EJB Info used to generate this object
- *
- * @param ejbModuleInfo
- */
- void setEjbModuleInfo(EjbModuleInfo ejbModuleInfo);
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java
deleted file mode 100644
index c3cb4e7b90..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java
+++ /dev/null
@@ -1,39 +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.contribution.jee;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EjbInfo {
- public enum EjbType {SESSION_STATELESS, SESSION_STATEFUL, SESSION_UNKNOWN, MESSAGE_DRIVEN};
- public String beanName;
- public Class<?> beanClass;
- public String mappedName;
- public EjbType ejbType;
- public Collection<Class<?>> businessRemote = new ArrayList<Class<?>>();
- public Collection<Class<?>> businessLocal = new ArrayList<Class<?>>();
- public Map<String, EjbReferenceInfo> ejbReferences = new HashMap<String, EjbReferenceInfo>();
- public Map<String, EnvEntryInfo> envEntries = new HashMap<String, EnvEntryInfo>();
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java
deleted file mode 100644
index 00f7011111..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java
+++ /dev/null
@@ -1,39 +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.contribution.jee;
-
-import java.net.URI;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface EjbModuleInfo {
- URI getUri();
- void setUri(URI uri);
-
- String getModuleName();
- void setModuleName(String moduleName);
-
- ClassLoader getModuleClassloader();
- void setmoduleClassloader(ClassLoader classLoader);
-
- Map<String, EjbInfo> getEjbInfos();
- EjbInfo getEjbInfo(String beanName);
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java
deleted file mode 100644
index 72d594c4d0..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java
+++ /dev/null
@@ -1,70 +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.contribution.jee;
-
-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.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A Model Resolver for EjbModule models.
- *
- * @version $Rev$ $Date$
- */
-public class EjbModuleModelResolver implements ModelResolver {
-
- private Map<URI, EjbModuleInfo> map = new HashMap<URI, EjbModuleInfo>();
- private Contribution contribution;
-
- public EjbModuleModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
- this.contribution = contribution;
- }
-
- public void addModel(Object resolved) {
- EjbModuleInfo ejbModule = (EjbModuleInfo)resolved;
- map.put(ejbModule.getUri(), ejbModule);
- }
-
- public Object removeModel(Object resolved) {
- return map.remove(((EjbModuleInfo)resolved).getUri());
- }
-
- public <T> T resolveModel(Class<T> modelClass, T unresolved) {
- // Lookup a EjbModuleInfo for the given URI
- URI uri = ((EjbModuleInfo)unresolved).getUri();
- if (uri != null) {
- EjbModuleInfo resolved = (EjbModuleInfo) map.get(uri);
- if (resolved != null) {
- return modelClass.cast(resolved);
- } else {
- uri = URI.create("");
- resolved = (EjbModuleInfo) map.get(uri);
- if (resolved != null) {
- return modelClass.cast(resolved);
- }
- }
- }
- return unresolved;
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java
deleted file mode 100644
index 109a32d62c..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.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.contribution.jee;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EjbReferenceInfo {
- public enum EjbType {STATELESS, STATEFUL, SESSION_UNKNOWN, UNKNOWN};
- public enum RefType {LOCAL, REMOTE, UNKNOWN};
- public String referenceName;
- public EjbType ejbType;
- public RefType referenceType;
- public Class<?> businessInterface;
- public String ejbLink;
- public String mappedName;
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java
deleted file mode 100644
index 26ce44c07e..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java
+++ /dev/null
@@ -1,29 +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.contribution.jee;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class EnvEntryInfo {
- public String type;
- public String name;
- public String value;
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java
deleted file mode 100644
index c0b54156ea..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java
+++ /dev/null
@@ -1,31 +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.contribution.jee;
-
-import org.apache.tuscany.sca.assembly.Composite;
-
-
-/**
- * @version $Rev: 755722 $ $Date: 2009-03-18 20:23:02 +0000 (Wed, 18 Mar 2009) $
- */
-public interface ExternalEarInfo {
-
- JavaEEApplicationInfo getAppInfo();
- Composite getAppComposite();
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java
deleted file mode 100644
index 107c251ea7..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java
+++ /dev/null
@@ -1,38 +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.contribution.jee;
-
-import java.net.URI;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface JavaEEApplicationInfo {
- URI getUri();
- void setUri(URI uri);
-
- String getApplicationName();
- void setApplicationName(String applicationName);
-
- Map<String, WebModuleInfo> getWebModuleInfos();
- WebModuleInfo getWebModuleInfo(String moduleName);
- Map<String, EjbModuleInfo> getEjbModuleInfos();
- EjbModuleInfo getEjbModuleInfo(String moduleName);
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java
deleted file mode 100644
index e27fa5ae44..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java
+++ /dev/null
@@ -1,70 +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.contribution.jee;
-
-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.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A Model Resolver for JavaEEApplicationInfo models.
- *
- * @version $Rev$ $Date$
- */
-public class JavaEEApplicationModelResolver implements ModelResolver {
-
- private Map<URI, JavaEEApplicationInfo> map = new HashMap<URI, JavaEEApplicationInfo>();
- private Contribution contribution;
-
- public JavaEEApplicationModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
- this.contribution = contribution;
- }
-
- public void addModel(Object resolved) {
- JavaEEApplicationInfo jeeApp = (JavaEEApplicationInfo)resolved;
- map.put(jeeApp.getUri(), jeeApp);
- }
-
- public Object removeModel(Object resolved) {
- return map.remove(((JavaEEApplicationInfo)resolved).getUri());
- }
-
- public <T> T resolveModel(Class<T> modelClass, T unresolved) {
- // Lookup a JavaEEApplicationInfo for the given URI
- URI uri = ((JavaEEApplicationInfo)unresolved).getUri();
- if (uri != null) {
- JavaEEApplicationInfo resolved = (JavaEEApplicationInfo) map.get(uri);
- if (resolved != null) {
- return modelClass.cast(resolved);
- } else {
- uri = URI.create("");
- resolved = (JavaEEApplicationInfo) map.get(uri);
- if (resolved != null) {
- return modelClass.cast(resolved);
- }
- }
- }
- return unresolved;
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java
deleted file mode 100644
index 7b7d1f161f..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java
+++ /dev/null
@@ -1,38 +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.contribution.jee;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-
-/**
- * Compute componentType with EJB3 business interfaces translating into SCA services.
- *
- * @version $Rev$ $Date$
- */
-public interface JavaEEExtension {
- // The EJBImplementation model is a straight implementation so we deal in
- // component types
- ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName);
-
- // The JEEImplemenation model is a composite and so we have to fluff
- // up the composite contents to match the JEE artifact
- void createImplementationJeeComposite(EjbModuleInfo ejbModule, Composite composite);
- void createImplementationJeeComposite(JavaEEApplicationInfo appInfo, Composite composite);
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java
deleted file mode 100644
index ab89ce2bf7..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java
+++ /dev/null
@@ -1,34 +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.contribution.jee;
-
-import java.net.URL;
-
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-
-/**
- * Introspect JavaEE modules and applications.
- *
- * @version $Rev$ $Date$
- */
-public interface JavaEEIntrospector {
- WebModuleInfo introspectWebArchive(URL artifactURL) throws ContributionReadException;
- EjbModuleInfo introspectEjbArchive(URL artifactURL) throws ContributionReadException;
- JavaEEApplicationInfo introspectJeeArchive(URL artifactURL) throws ContributionReadException;
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java
deleted file mode 100644
index 50a449ce78..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java
+++ /dev/null
@@ -1,41 +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.contribution.jee;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-
-/**
- * Compute componentType with Remote EJB references translating into SCA references and env-entries translating into
- * SCA properties.
- *
- * @version $Rev$ $Date$
- */
-public interface JavaEEOptionalExtension {
- // The EJBImplementation and WEBImplemenation models are straight implementations so
- // we deals in component types
- ComponentType createImplementationWebComponentType(WebModuleInfo webModule);
- ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName);
-
- // The JEEImplemenation model is a composite and so we have to fluff
- // up the composite contents to match the JEE artifact
- void createImplementationJeeComposite(WebModuleInfo webModule, Composite composite);
- void createImplementationJeeComposite(EjbModuleInfo ejbModule, Composite composite);
- void createImplementationJeeComposite(JavaEEApplicationInfo appInfo, Composite composite);
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java
deleted file mode 100644
index e36aea2790..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java
+++ /dev/null
@@ -1,30 +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.contribution.jee;
-
-
-/**
- * @version $Rev$ $Date$
- *
- * Information on SCA reference tags in JSP pages.
- */
-public class JspReferenceTagInfo {
- public String name;
- public Class<?> type;
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java
deleted file mode 100644
index e981339733..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java
+++ /dev/null
@@ -1,32 +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.contribution.jee;
-
-import java.net.URI;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface ModelObject {
- URI getUri();
- void setUri(URI uri);
-
- Object getObject();
- void setObject(Object obj);
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.java
deleted file mode 100644
index aa24dcac2c..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.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.contribution.jee;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.jee.impl.ModelObjectImpl;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A Model Resolver for obtaining any model object using URI.
- *
- * @version $Rev$ $Date$
- */
-public class ModelObjectModelResolver implements ModelResolver {
-
- private Map<URI, ModelObject> map = new HashMap<URI, ModelObject>();
- private Contribution contribution;
-
- public ModelObjectModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
- this.contribution = contribution;
- }
-
- public void addModel(Object resolved) {
- map.put(((ModelObject)resolved).getUri(), (ModelObject)resolved);
- }
-
- public Object removeModel(Object resolved) {
- return map.remove(((ModelObject)resolved).getUri());
- }
-
- public <T> T resolveModel(Class<T> modelClass, T unresolved) {
- URI uri = ((ModelObject)unresolved).getUri();
- if (uri != null) {
- ModelObject resolved = (ModelObject) map.get(uri);
- if (resolved != null) {
- return modelClass.cast(resolved);
- } else {
- for(Artifact artifact : contribution.getArtifacts()) {
- if(artifact.getURI().equals(uri.toString())) {
- resolved = new ModelObjectImpl();
- resolved.setUri(uri);
- resolved.setObject(artifact.getModel());
- return modelClass.cast(resolved);
- }
- }
- }
- }
- return unresolved;
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebImplementationGenerated.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebImplementationGenerated.java
deleted file mode 100644
index ee3b057ee6..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebImplementationGenerated.java
+++ /dev/null
@@ -1,43 +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.contribution.jee;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-
-
-
-/**
- * The model representing a WEB implementation in an SCA assembly model when the
- * WEB implementation has been generated by introspecting a non-enhanced EAR
- */
-public interface WebImplementationGenerated extends Implementation {
-
- /**
- * Return the WebModuleInfo which generated this Web component implementation
- * @return
- */
- WebModuleInfo getWebInfo();
-
- /**
- * Set the WebModuleInfo which generated this Web component implementation
- * @param webInfo
- */
- void setWebInfo(WebModuleInfo webInfo);
-
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
deleted file mode 100644
index 79e9019b11..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
+++ /dev/null
@@ -1,50 +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.contribution.jee;
-
-import java.net.URI;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface WebModuleInfo {
- URI getUri();
- void setUri(URI uri);
-
- String getModuleName();
- void setModuleName(String moduleName);
-
- ClassLoader getModuleClassloader();
- void setmoduleClassloader(ClassLoader classLoader);
-
- Map<String, EjbReferenceInfo> getEjbReferences();
- Map<String, EnvEntryInfo> getEnvEntries();
-
- EjbReferenceInfo getEjbReference(String ejbRefName);
- EnvEntryInfo getEnvEntry(String envEntryName);
-
- Collection<Class<?>> getServletClasses();
- Collection<Class<?>> getListenerClasses();
- Collection<Class<?>> getFilterClasses();
- Collection<Class<?>> getJSFClasses();
-
- Collection<JspReferenceTagInfo> getJspReferenceTags();
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java
deleted file mode 100644
index 74117a13f0..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java
+++ /dev/null
@@ -1,70 +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.contribution.jee;
-
-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.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A Model Resolver for WebModuleInfo models.
- *
- * @version $Rev$ $Date$
- */
-public class WebModuleModelResolver implements ModelResolver {
-
- private Map<URI, WebModuleInfo> map = new HashMap<URI, WebModuleInfo>();
- private Contribution contribution;
-
- public WebModuleModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
- this.contribution = contribution;
- }
-
- public void addModel(Object resolved) {
- WebModuleInfo webModule = (WebModuleInfo)resolved;
- map.put(webModule.getUri(), webModule);
- }
-
- public Object removeModel(Object resolved) {
- return map.remove(((WebModuleInfo)resolved).getUri());
- }
-
- public <T> T resolveModel(Class<T> modelClass, T unresolved) {
- // Lookup a WebModuleInfo for the given URI
- URI uri = ((WebModuleInfo)unresolved).getUri();
- if (uri != null) {
- WebModuleInfo resolved = (WebModuleInfo) map.get(uri);
- if (resolved != null) {
- return modelClass.cast(resolved);
- } else {
- uri = URI.create("");
- resolved = (WebModuleInfo) map.get(uri);
- if (resolved != null) {
- return modelClass.cast(resolved);
- }
- }
- }
- return unresolved;
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java
deleted file mode 100644
index eb5b8d8463..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.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 org.apache.tuscany.sca.contribution.jee.impl;
-
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
-import org.apache.tuscany.sca.contribution.jee.EJBImplementationGenerated;
-import org.apache.tuscany.sca.contribution.jee.EjbInfo;
-import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
-
-/**
- * The model representing an EJB implementation in an SCA assembly model when the
- * EJB implementation has been generated by introspecting a non-enhanced EAR $
- */
-class EJBImplementationGeneratedImpl extends ImplementationImpl implements EJBImplementationGenerated {
-
- private EjbInfo ejbInfo;
- private EjbModuleInfo ejbModuleInfo;
-
- /**
- * Constructs a new EJB implementation.
- */
- EJBImplementationGeneratedImpl() {
- super();
- }
-
- @Override
- public ConstrainingType getConstrainingType() {
- // The EJB implementation does not support constrainingTypes
- return null;
- }
-
- @Override
- public void setConstrainingType(ConstrainingType constrainingType) {
- // The EJB implementation does not support constrainingTypes
- }
-
- public EjbInfo getEJBInfo() {
- return ejbInfo;
- }
-
- public void setEJBInfo(EjbInfo ejbInfo) {
- this.ejbInfo = ejbInfo;
- }
-
- public EjbModuleInfo getEjbModuleInfo() {
- return ejbModuleInfo;
- }
-
- public void setEjbModuleInfo(EjbModuleInfo ejbModuleInfo) {
- this.ejbModuleInfo = ejbModuleInfo;
- }
-
- // make sure the generated implementation can be distinguished
- // based on the ejb info that is referenced
- @Override
- public int hashCode() {
- return getEJBInfo().hashCode();
- }
-
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedProcessor.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedProcessor.java
deleted file mode 100644
index bc8bc99770..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedProcessor.java
+++ /dev/null
@@ -1,67 +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.contribution.jee.impl;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-
-/**
- * Dummy processor that's used to mark EJBImplementationGeneratedImpl instance
- * as resolved at the appropriate point in the resolution processing
- *
- * @version $Rev$ $Date$
- */
-public class EJBImplementationGeneratedProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<EJBImplementationGeneratedImpl> {
-
- public EJBImplementationGeneratedProcessor(ExtensionPointRegistry registry,
- Monitor monitor) {
- }
-
- public QName getArtifactType() {
- return null;
- }
-
- public Class<EJBImplementationGeneratedImpl> getModelType() {
- // Returns the type of model processed by this processor
- return EJBImplementationGeneratedImpl.class;
- }
-
- public EJBImplementationGeneratedImpl read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
- return null;
- }
-
- public void resolve(EJBImplementationGeneratedImpl implementation, ModelResolver resolver) throws ContributionResolveException {
- implementation.setUnresolved(false);
- }
-
- public void write(EJBImplementationGeneratedImpl implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
deleted file mode 100644
index b0eb155636..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
+++ /dev/null
@@ -1,158 +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.contribution.jee.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-
-import org.apache.tuscany.sca.contribution.PackageType;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;
-import org.apache.tuscany.sca.contribution.service.ContributionException;
-import org.eclipse.emf.common.archive.ArchiveURLConnection;
-
-/**
- * Ear Contribution package processor.
- *
- * @version $Rev$ $Date$
- */
-public class EarContributionProcessor implements PackageProcessor {
-
- /* URL stream handler for "archive" */
- private static URLStreamHandler archiveUrlStreamHandler = new URLStreamHandler() {
- @Override
- protected URLConnection openConnection(URL u) throws IOException {
- return new ArchiveURLConnection(u);
- }
- };
-
- public URL getArtifactURL(URL packageSourceURL, URI artifact)
- throws MalformedURLException {
- if(artifact.toString().equals("")) {
- return packageSourceURL;
- }
- if (packageSourceURL.toString().startsWith("archive:")) {
- return new URL(packageSourceURL, artifact.toString(), archiveUrlStreamHandler);
- } else {
- return new URL("archive", "", -1, packageSourceURL.toExternalForm() + "!/" + artifact, archiveUrlStreamHandler);
- }
- }
-
- public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException, IOException {
- if (packageSourceURL == null) {
- throw new IllegalArgumentException("Invalid null package source URL.");
- }
-
- if (inputStream == null) {
- throw new IllegalArgumentException("Invalid null source inputstream.");
- }
-
- // The root is a jar file
- JarInputStream jar = new JarInputStream(inputStream);
- try {
- Set<String> names = new HashSet<String>();
- while (true) {
- JarEntry entry = jar.getNextJarEntry();
- if (entry == null) {
- // EOF
- break;
- }
-
- String name = entry.getName();
- if (!name.startsWith(".")) {
-
- // Trim trailing /
- if (name.endsWith("/")) {
- name = name.substring(0, name.length() - 1);
- }
-
- // Add the entry name
- if (!names.contains(name)) {
- names.add(name);
-
- // Add parent folder names to the list too
- for (;;) {
- int s = name.lastIndexOf('/');
- if (s == -1) {
- name = "";
- } else {
- name = name.substring(0, s);
- }
- if (!names.contains(name)) {
- names.add(name);
- } else {
- break;
- }
- }
- }
- }
- if(entry.getName().indexOf("/") == -1 && (entry.getName().toLowerCase().endsWith(".war") || entry.getName().toLowerCase().endsWith(".jar"))) {
- // A WAR or an EJB JAR file in the root of the archive.
- // Get entries from the nested archive.
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- int b;
- while((b = jar.read()) != -1) {
- bout.write(b);
- }
- bout.close();
- ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-
- PackageProcessor archiveProcessor = entry.getName().toLowerCase().endsWith(".war") ? new WarContributionProcessor() : new JarContributionProcessor();
- List<URI> artifacts = archiveProcessor.getArtifacts(packageSourceURL, bin);
- bin.close();
- for(URI artifact : artifacts) {
- // don't add in nested application composites
- if ((artifact.toString().endsWith("ejb-jar.composite") == false) &&
- (artifact.toString().endsWith("web.composite") == false)) {
- names.add(entry.getName()+"!/"+artifact);
- }
- }
- }
- }
-
- // Return list of URIs
- List<URI> artifacts = new ArrayList<URI>();
- for (String name: names) {
- artifacts.add(URI.create(name));
- }
- return artifacts;
-
- } finally {
- jar.close();
- }
- }
-
- public String getPackageType() {
- return PackageType.EAR;
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java
deleted file mode 100644
index 36aabefa99..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java
+++ /dev/null
@@ -1,69 +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.contribution.jee.impl;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
-import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * URLArtifactProcessor for EJB jars.
- *
- * @version $Rev$ $Date$
- */
-public class EjbArchiveProcessor implements URLArtifactProcessor<EjbModuleInfo> {
- private JavaEEIntrospector jeeIntrospector;
-
- public EjbArchiveProcessor(ExtensionPointRegistry registry, Monitor monitor) {
- jeeIntrospector = registry.getExtensionPoint(JavaEEIntrospector.class);
- }
-
- public String getArtifactType() {
- return ".jar";
- }
-
- public EjbModuleInfo read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
- if (jeeIntrospector != null) {
- EjbModuleInfo ejbModuleInfo = jeeIntrospector.introspectEjbArchive(artifactURL);
- if(ejbModuleInfo != null) {
- ejbModuleInfo.setUri(artifactURI);
- ejbModuleInfo.setModuleName(new File(artifactURL.getFile()).getName());
- }
- return ejbModuleInfo;
- }
- return null;
- }
-
- public Class<EjbModuleInfo> getModelType() {
- return EjbModuleInfo.class;
- }
-
- public void resolve(EjbModuleInfo arg0, ModelResolver arg1)
- throws ContributionResolveException {
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java
deleted file mode 100644
index 830aa81b19..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java
+++ /dev/null
@@ -1,66 +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.contribution.jee.impl;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.jee.EjbInfo;
-import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
-
-public class EjbModuleInfoImpl implements EjbModuleInfo {
-
- private URI uri;
- private String moduleName;
- private ClassLoader moduleClassLoader;
- private Map<String, EjbInfo> ejbInfos = new HashMap<String, EjbInfo>();
-
- public EjbInfo getEjbInfo(String beanName) {
- return ejbInfos.get(beanName);
- }
-
- public Map<String, EjbInfo> getEjbInfos() {
- return ejbInfos;
- }
-
- public String getModuleName() {
- return moduleName;
- }
-
- public void setModuleName(String moduleName) {
- this.moduleName = moduleName;
- }
-
- public URI getUri() {
- return uri;
- }
-
- public void setUri(URI uri) {
- this.uri = uri;
- }
-
- public ClassLoader getModuleClassloader() {
- return moduleClassLoader;
- }
-
- public void setmoduleClassloader(ClassLoader classLoader) {
- this.moduleClassLoader = classLoader;
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java
deleted file mode 100644
index 993605ebe5..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java
+++ /dev/null
@@ -1,68 +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.contribution.jee.impl;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
-import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
-import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
-
-public class JavaEEApplicationInfoImpl implements JavaEEApplicationInfo {
-
- private URI uri;
- private String applicationName;
- private Map<String, EjbModuleInfo> ejbModuleInfos = new HashMap<String, EjbModuleInfo>();
- private Map<String, WebModuleInfo> webModuleInfos = new HashMap<String, WebModuleInfo>();
-
-
- public String getApplicationName() {
- return applicationName;
- }
-
- public void setApplicationName(String applicationName) {
- this.applicationName = applicationName;
- }
-
- public EjbModuleInfo getEjbModuleInfo(String moduleName) {
- return ejbModuleInfos.get(moduleName);
- }
-
- public Map<String, EjbModuleInfo> getEjbModuleInfos() {
- return ejbModuleInfos;
- }
-
- public WebModuleInfo getWebModuleInfo(String moduleName) {
- return webModuleInfos.get(moduleName);
- }
-
- public Map<String, WebModuleInfo> getWebModuleInfos() {
- return webModuleInfos;
- }
-
- public URI getUri() {
- return uri;
- }
-
- public void setUri(URI uri) {
- this.uri = uri;
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java
deleted file mode 100644
index 53201b5e2b..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java
+++ /dev/null
@@ -1,59 +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.contribution.jee.impl;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
-import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-public class JavaEEArchiveProcessor implements URLArtifactProcessor<JavaEEApplicationInfo> {
- private JavaEEIntrospector jeeIntrospector;
-
- public JavaEEArchiveProcessor(ExtensionPointRegistry registry, Monitor monitor) {
- jeeIntrospector = registry.getExtensionPoint(JavaEEIntrospector.class);
- }
-
- public String getArtifactType() {
- return ".ear";
- }
-
- public JavaEEApplicationInfo read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
- JavaEEApplicationInfo jeeAppInfo = jeeIntrospector.introspectJeeArchive(artifactURL);
- jeeAppInfo.setUri(artifactURI);
- jeeAppInfo.setApplicationName(new File(artifactURL.getFile()).getName());
- return jeeAppInfo;
- }
-
- public Class<JavaEEApplicationInfo> getModelType() {
- return JavaEEApplicationInfo.class;
- }
-
- public void resolve(JavaEEApplicationInfo arg0, ModelResolver arg1)
- throws ContributionResolveException {
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
deleted file mode 100644
index 4271a93399..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
+++ /dev/null
@@ -1,262 +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.contribution.jee.impl;
-
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.jee.EJBImplementationGenerated;
-import org.apache.tuscany.sca.contribution.jee.EjbInfo;
-import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
-import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
-import org.apache.tuscany.sca.contribution.jee.JavaEEExtension;
-import org.apache.tuscany.sca.contribution.jee.EjbInfo.EjbType;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-public class JavaEEExtensionImpl implements JavaEEExtension {
-
- private AssemblyFactory assemblyFactory;
- private JavaInterfaceFactory javaInterfaceFactory;
- private PolicyFactory policyFactory;
- private Intent EJB_INTENT;
-
- public JavaEEExtensionImpl(ModelFactoryExtensionPoint modelFactories) {
- this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
- this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
- this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-
- EJB_INTENT = policyFactory.createIntent();
- EJB_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0", "ejb"));
- }
-
- public ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName) {
- ComponentType componentType = assemblyFactory.createComponentType();
- EjbInfo ejbInfo = ejbModule.getEjbInfo(ejbName);
- if(ejbInfo == null) {
- return null;
- }
- if(ejbInfo.ejbType.compareTo(EjbType.MESSAGE_DRIVEN) != 0) {
- for(Class<?> intf : ejbInfo.businessRemote) {
- Service service = assemblyFactory.createComponentService();
- String intfName = intf.getName();
- String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
- service.setName(serviceName);
- InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
- try {
- ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
- } catch (InvalidInterfaceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- service.setInterfaceContract(ic);
- service.getRequiredIntents().add(EJB_INTENT);
-
- componentType.getServices().add(service);
- }
-
- for(Class<?> intf : ejbInfo.businessLocal) {
- Service service = assemblyFactory.createComponentService();
- String intfName = intf.getName();
- String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
- service.setName(serviceName);
- InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
- try {
- ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
- } catch (InvalidInterfaceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- service.setInterfaceContract(ic);
- service.getRequiredIntents().add(EJB_INTENT);
-
- componentType.getServices().add(service);
- }
- }
- return componentType;
- }
-
- public void createImplementationJeeComposite(EjbModuleInfo ejbModule, Composite composite) {
-
- for(Map.Entry<String, EjbInfo> entry : ejbModule.getEjbInfos().entrySet()) {
- EjbInfo ejbInfo = entry.getValue();
-
- Component component = findComponent(composite, ejbInfo, ejbModule);
-
- if(ejbInfo.ejbType.compareTo(EjbType.MESSAGE_DRIVEN) != 0) {
- for(Class<?> intf : ejbInfo.businessRemote) {
- ComponentService service = assemblyFactory.createComponentService();
- String intfName = intf.getName();
- String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
- serviceName = ejbInfo.beanName+"_"+serviceName;
- service.setName(serviceName);
- InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
- try {
- ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
- } catch (InvalidInterfaceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- service.setInterfaceContract(ic);
- service.getRequiredIntents().add(EJB_INTENT);
-
- addComponentService(composite, component, service);
- }
-
- for(Class<?> intf : ejbInfo.businessLocal) {
- ComponentService service = assemblyFactory.createComponentService();
- String intfName = intf.getName();
- String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
- serviceName = ejbInfo.beanName+"_"+serviceName;
- service.setName(serviceName);
- InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
- try {
- ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
- } catch (InvalidInterfaceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- service.setInterfaceContract(ic);
- service.getRequiredIntents().add(EJB_INTENT);
-
- addComponentService(composite, component, service);
- }
- }
- }
- }
-
- public void createImplementationJeeComposite(JavaEEApplicationInfo appInfo, Composite composite) {
-
- for(Map.Entry<String, EjbModuleInfo> entry0 : appInfo.getEjbModuleInfos().entrySet()) {
- EjbModuleInfo ejbModule = entry0.getValue();
-
- for(Map.Entry<String, EjbInfo> entry : ejbModule.getEjbInfos().entrySet()) {
- EjbInfo ejbInfo = entry.getValue();
-
- Component component = findComponent(composite, ejbInfo, ejbModule);
-
- if(ejbInfo.ejbType.compareTo(EjbType.MESSAGE_DRIVEN) != 0) {
- for(Class<?> intf : ejbInfo.businessRemote) {
- ComponentService service = assemblyFactory.createComponentService();
- String intfName = intf.getName();
- String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
- serviceName = ejbInfo.mappedName+"_"+serviceName;
- service.setName(serviceName);
- InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
- try {
- ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
- } catch (InvalidInterfaceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- service.setInterfaceContract(ic);
- service.getRequiredIntents().add(EJB_INTENT);
-
- addComponentService(composite, component, service);
- }
-
- for(Class<?> intf : ejbInfo.businessLocal) {
- ComponentService service = assemblyFactory.createComponentService();
- String intfName = intf.getName();
- String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
- serviceName = ejbInfo.mappedName+"_"+serviceName;
- service.setName(serviceName);
- InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
- try {
- ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
- } catch (InvalidInterfaceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- service.setInterfaceContract(ic);
- service.getRequiredIntents().add(EJB_INTENT);
-
- addComponentService(composite, component, service);
- }
- }
- }
- }
- }
-
- /**
- * We are fluffing up the JEEImplemention composite to represented the components
- * in the JEE archive. Given the JEEimplemenation composite find a named component
- * it if already exists or create it if it doesn't.
- *
- * @param ejbInfo
- * @param componentName
- * @return
- */
- private Component findComponent(Composite composite, EjbInfo ejbInfo, EjbModuleInfo ejbmoduleInfo){
- String componentName = ejbInfo.beanName;
- Component component = null;
-
- for (Component tmpComponent : composite.getComponents()){
- if (tmpComponent.getName().equals(componentName)){
- component = tmpComponent;
- break;
- }
- }
-
- if (component == null){
- component = assemblyFactory.createComponent();
- component.setName(componentName);
- component.setUnresolved(true);
- composite.getComponents().add(component);
-
- EJBImplementationGenerated implementation = new EJBImplementationGeneratedImpl();
- implementation.setUnresolved(true);
- implementation.setEJBInfo(ejbInfo);
- implementation.setEjbModuleInfo(ejbmoduleInfo);
- component.setImplementation(implementation);
- }
-
- return component;
- }
-
- /**
- * Add a component service and fluff up a composite service to match
- *
- * @param composite
- * @param component
- * @param service
- */
- private void addComponentService(Composite composite, Component component, ComponentService service){
- component.getImplementation().getServices().add(service);
-
- CompositeService compositeService = assemblyFactory.createCompositeService();
- composite.getServices().add(compositeService);
-
- compositeService.setName(service.getName());
- compositeService.setPromotedComponent(component);
- compositeService.setPromotedService(service);
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
deleted file mode 100644
index e07b6e8aba..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
+++ /dev/null
@@ -1,359 +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.contribution.jee.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeReference;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.jee.EJBImplementationGenerated;
-import org.apache.tuscany.sca.contribution.jee.EjbInfo;
-import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
-import org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo;
-import org.apache.tuscany.sca.contribution.jee.EnvEntryInfo;
-import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
-import org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension;
-import org.apache.tuscany.sca.contribution.jee.WebImplementationGenerated;
-import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-public class JavaEEOptionalExtensionImpl implements JavaEEOptionalExtension {
-
- private AssemblyFactory assemblyFactory;
- private JavaInterfaceFactory javaInterfaceFactory;
- private PolicyFactory policyFactory;
- private Intent EJB_INTENT;
-
- public static final Map<String, QName> ALLOWED_ENV_ENTRY_TYPES;
- static {
- ALLOWED_ENV_ENTRY_TYPES = new HashMap<String, QName>();
- ALLOWED_ENV_ENTRY_TYPES.put(String.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "string",
- "xsd"));
- ALLOWED_ENV_ENTRY_TYPES.put(Character.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "string",
- "xsd"));
- ALLOWED_ENV_ENTRY_TYPES.put(Byte.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "byte", "xsd"));
- ALLOWED_ENV_ENTRY_TYPES.put(Short.class.getName(),
- new QName("http://www.w3.org/2001/XMLSchema", "short", "xsd"));
- ALLOWED_ENV_ENTRY_TYPES.put(Integer.class.getName(),
- new QName("http://www.w3.org/2001/XMLSchema", "int", "xsd"));
- ALLOWED_ENV_ENTRY_TYPES.put(Long.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "long", "xsd"));
- ALLOWED_ENV_ENTRY_TYPES.put(Boolean.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "boolean",
- "xsd"));
- ALLOWED_ENV_ENTRY_TYPES.put(Double.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "double",
- "xsd"));
- ALLOWED_ENV_ENTRY_TYPES.put(Float.class.getName(),
- new QName("http://www.w3.org/2001/XMLSchema", "float", "xsd"));
- }
-
- public JavaEEOptionalExtensionImpl(ModelFactoryExtensionPoint modelFactories) {
- this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
- this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
- this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-
- EJB_INTENT = policyFactory.createIntent();
- EJB_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0", "ejb"));
- }
-
- public ComponentType createImplementationWebComponentType(WebModuleInfo webModule) {
- ComponentType componentType = assemblyFactory.createComponentType();
-
- // Process Remote EJB References
- for(Map.Entry<String, EjbReferenceInfo> entry : webModule.getEjbReferences().entrySet()) {
- EjbReferenceInfo ejbRef = entry.getValue();
- String referenceName = entry.getKey();
- referenceName = referenceName.replace("/", "_");
- Reference reference = assemblyFactory.createComponentReference();
- reference.setName(referenceName);
- InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
- try {
- ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface));
- } catch (InvalidInterfaceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- reference.setInterfaceContract(ic);
- reference.getRequiredIntents().add(EJB_INTENT);
- reference.setMultiplicity(Multiplicity.ZERO_ONE);
- componentType.getReferences().add(reference);
- }
-
- // Process env-entries to compute properties
- for (Map.Entry<String, EnvEntryInfo> entry : webModule.getEnvEntries().entrySet()) {
- EnvEntryInfo envEntry = entry.getValue();
- String type = envEntry.type;
- if (!ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
- continue;
- }
- String propertyName = envEntry.name;
- propertyName = propertyName.replace("/", "_");
- String value = envEntry.value;
- Property property = assemblyFactory.createComponentProperty();
- property.setName(propertyName);
- property.setXSDType(ALLOWED_ENV_ENTRY_TYPES.get(type));
- property.setValue(value);
- componentType.getProperties().add(property);
- }
-
- return componentType;
- }
- public ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName) {
- ComponentType componentType = assemblyFactory.createComponentType();
- EjbInfo ejbInfo = ejbModule.getEjbInfo(ejbName);
- if(ejbInfo == null) {
- return null;
- }
-
- // Process Remote EJB References
- for(Map.Entry<String, EjbReferenceInfo> entry : ejbInfo.ejbReferences.entrySet()) {
- EjbReferenceInfo ejbRef = entry.getValue();
- String referenceName = entry.getKey();
- referenceName = referenceName.replace("/", "_");
- Reference reference = assemblyFactory.createComponentReference();
- reference.setName(referenceName);
- InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
- try {
- ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface));
- } catch (InvalidInterfaceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- reference.setInterfaceContract(ic);
- reference.getRequiredIntents().add(EJB_INTENT);
- reference.setMultiplicity(Multiplicity.ZERO_ONE);
- componentType.getReferences().add(reference);
- }
-
- // Process env-entries to compute properties
- for (Map.Entry<String, EnvEntryInfo> entry : ejbInfo.envEntries.entrySet()) {
- EnvEntryInfo envEntry = entry.getValue();
- String type = envEntry.type;
- if (!ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
- continue;
- }
- String propertyName = envEntry.name;
- propertyName = propertyName.replace("/", "_");
- String value = envEntry.value;
- Property property = assemblyFactory.createComponentProperty();
- property.setName(propertyName);
- property.setXSDType(ALLOWED_ENV_ENTRY_TYPES.get(type));
- property.setValue(value);
- componentType.getProperties().add(property);
- }
- return componentType;
- }
-
- public void createImplementationJeeComposite(WebModuleInfo webModule, Composite composite) {
-
- Component component = findComponent(composite, webModule);
-
- // Process Remote EJB References
- for(Map.Entry<String, EjbReferenceInfo> entry : webModule.getEjbReferences().entrySet()) {
- EjbReferenceInfo ejbRef = entry.getValue();
- String referenceName = entry.getKey();
- referenceName = referenceName.replace("/", "_");
- ComponentReference reference = assemblyFactory.createComponentReference();
- reference.setName(referenceName);
- InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
- try {
- ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface));
- } catch (InvalidInterfaceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- reference.setInterfaceContract(ic);
- reference.getRequiredIntents().add(EJB_INTENT);
- reference.setMultiplicity(Multiplicity.ZERO_ONE);
-
- addComponentReference(composite, component, reference);
- }
- }
-
- public void createImplementationJeeComposite(EjbModuleInfo ejbModule, Composite composite) {
-
- for(Map.Entry<String, EjbInfo> entry : ejbModule.getEjbInfos().entrySet()) {
- EjbInfo ejbInfo = entry.getValue();
-
- Component component = findComponent(composite, ejbInfo, ejbModule);
-
- // Process Remote EJB References
- for(Map.Entry<String, EjbReferenceInfo> entry1 : ejbInfo.ejbReferences.entrySet()) {
- EjbReferenceInfo ejbRef = entry1.getValue();
- String referenceName = ejbRef.referenceName;
- referenceName = referenceName.replace("/", "_");
- referenceName = ejbInfo.beanName + "_" + referenceName;
- ComponentReference reference = assemblyFactory.createComponentReference();
- reference.setName(referenceName);
- InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
- try {
- ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface));
- } catch (InvalidInterfaceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- reference.setInterfaceContract(ic);
- reference.getRequiredIntents().add(EJB_INTENT);
- reference.setMultiplicity(Multiplicity.ZERO_ONE);
-
- addComponentReference(composite, component, reference);
- }
- }
- }
-
-
- public void createImplementationJeeComposite(JavaEEApplicationInfo appInfo, Composite composite) {
-
- for(Map.Entry<String, EjbModuleInfo> entry0 : appInfo.getEjbModuleInfos().entrySet()) {
- EjbModuleInfo ejbModule = entry0.getValue();
-
- for(Map.Entry<String, EjbInfo> entry : ejbModule.getEjbInfos().entrySet()) {
- EjbInfo ejbInfo = entry.getValue();
-
- Component component = findComponent(composite, ejbInfo, ejbModule);
-
- // Process Remote EJB References
- for(Map.Entry<String, EjbReferenceInfo> entry1 : ejbInfo.ejbReferences.entrySet()) {
- EjbReferenceInfo ejbRef = entry1.getValue();
- String referenceName = ejbRef.referenceName;
- referenceName = referenceName.replace("/", "_");
- referenceName = ejbInfo.beanName + "_" + referenceName;
- ComponentReference reference = assemblyFactory.createComponentReference();
- reference.setName(referenceName);
- InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
- try {
- ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface));
- } catch (InvalidInterfaceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- reference.setInterfaceContract(ic);
- reference.getRequiredIntents().add(EJB_INTENT);
- reference.setMultiplicity(Multiplicity.ZERO_ONE);
-
- addComponentReference(composite, component, reference);
- }
- }
- }
- }
-
- /**
- * We are fluffing up the JEEImplemention composite to represent the components
- * in the JEE archive. Given the JEEimplemenation composite find a named component
- * it if already exists or create it if it doesn't.
- *
- * @param composite
- * @param ejbInfo
- * @return
- */
- private Component findComponent(Composite composite, EjbInfo ejbInfo, EjbModuleInfo ejbmoduleInfo){
- String componentName = ejbInfo.beanName;
- Component component = null;
-
- for (Component tmpComponent : composite.getComponents()){
- if (tmpComponent.getName().equals(componentName)){
- component = tmpComponent;
- break;
- }
- }
-
- if (component == null){
- component = assemblyFactory.createComponent();
- component.setName(componentName);
- component.setUnresolved(true);
- composite.getComponents().add(component);
-
- EJBImplementationGenerated implementation = new EJBImplementationGeneratedImpl();
- implementation.setUnresolved(true);
- implementation.setEJBInfo(ejbInfo);
- implementation.setEjbModuleInfo(ejbmoduleInfo);
- component.setImplementation(implementation);
- }
-
- return component;
- }
-
- /**
- * We are fluffing up the JEEImplemention composite to represent the components
- * in the JEE archive. Given the JEEimplemenation composite find a named component
- * it if already exists or create it if it doesn't.
- *
- * @param composite
- * @param ejbInfo
- * @return
- */
- private Component findComponent(Composite composite, WebModuleInfo webInfo){
- String componentName = webInfo.getModuleName();
- Component component = null;
-
- for (Component tmpComponent : composite.getComponents()){
- if (tmpComponent.getName().equals(componentName)){
- component = tmpComponent;
- break;
- }
- }
-
- if (component == null){
- component = assemblyFactory.createComponent();
- component.setName(componentName);
- component.setUnresolved(true);
- composite.getComponents().add(component);
-
- WebImplementationGenerated implementation = new WebImplementationGeneratedImpl();
- implementation.setUnresolved(true);
- // need generated impl to represent web modules
- implementation.setWebInfo(webInfo);
- component.setImplementation(implementation);
- }
-
- return component;
- }
-
- /**
- * Add a component reference and fluff up a composite reference to match
- *
- * @param composite
- * @param component
- * @param service
- */
- private void addComponentReference(Composite composite, Component component, ComponentReference reference){
- component.getImplementation().getReferences().add(reference);
-
- CompositeReference compositeReference = assemblyFactory.createCompositeReference();
- composite.getReferences().add(compositeReference);
-
- compositeReference.setName(reference.getName());
- compositeReference.getPromotedReferences().add(reference);
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java
deleted file mode 100644
index 95050dfd88..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java
+++ /dev/null
@@ -1,51 +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.contribution.jee.impl;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.contribution.jee.ModelObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ModelObjectImpl implements ModelObject {
-
- private URI uri;
- private Object obj;
-
- public ModelObjectImpl() {
- }
-
- public Object getObject() {
- return obj;
- }
-
- public void setObject(Object obj) {
- this.obj = obj;
- }
-
- public URI getUri() {
- return uri;
- }
-
- public void setUri(URI uri) {
- this.uri = uri;
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java
deleted file mode 100644
index 17974e831f..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java
+++ /dev/null
@@ -1,36 +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.contribution.jee.impl;
-
-import org.apache.tuscany.sca.contribution.PackageType;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;
-
-/**
- * War Contribution package processor.
- *
- * @version $Rev$ $Date$
- */
-public class WarContributionProcessor extends JarContributionProcessor implements PackageProcessor {
- @Override
- public String getPackageType() {
- return PackageType.WAR;
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java
deleted file mode 100644
index 9e9bfb8bc1..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java
+++ /dev/null
@@ -1,59 +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.contribution.jee.impl;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
-import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-public class WebArchiveProcessor implements URLArtifactProcessor<WebModuleInfo> {
- private JavaEEIntrospector jeeIntrospector;
-
- public WebArchiveProcessor(ExtensionPointRegistry registry, Monitor monitor) {
- jeeIntrospector = registry.getExtensionPoint(JavaEEIntrospector.class);
- }
-
- public String getArtifactType() {
- return ".war";
- }
-
- public WebModuleInfo read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
- WebModuleInfo webModuleInfo = jeeIntrospector.introspectWebArchive(artifactURL);
- webModuleInfo.setUri(artifactURI);
- webModuleInfo.setModuleName(new File(artifactURL.getFile()).getName());
- return webModuleInfo;
- }
-
- public Class<WebModuleInfo> getModelType() {
- return WebModuleInfo.class;
- }
-
- public void resolve(WebModuleInfo arg0, ModelResolver arg1)
- throws ContributionResolveException {
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedImpl.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedImpl.java
deleted file mode 100644
index d898bd4ea0..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedImpl.java
+++ /dev/null
@@ -1,60 +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.contribution.jee.impl;
-
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
-import org.apache.tuscany.sca.contribution.jee.WebImplementationGenerated;
-import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
-
-
-/**
- * The model representing a WEB implementation in an SCA assembly model when the
- * WEB implementation has been generated by introspecting a non-enhanced EAR
- */
-class WebImplementationGeneratedImpl extends ImplementationImpl implements WebImplementationGenerated {
-
- private WebModuleInfo webInfo;
-
- /**
- * Constructs a new EJB implementation.
- */
- WebImplementationGeneratedImpl() {
- super();
- }
-
- @Override
- public ConstrainingType getConstrainingType() {
- // The Web implementation does not support constrainingTypes
- return null;
- }
-
- @Override
- public void setConstrainingType(ConstrainingType constrainingType) {
- // The Web implementation does not support constrainingTypes
- }
-
- public WebModuleInfo getWebInfo() {
- return webInfo;
- }
-
- public void setWebInfo(WebModuleInfo webInfo) {
- this.webInfo = webInfo;
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedProcessor.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedProcessor.java
deleted file mode 100644
index 4e50b15960..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedProcessor.java
+++ /dev/null
@@ -1,66 +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.contribution.jee.impl;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-
-/**
- * Dummy processor that's used to mark WebImplementationGeneratedImpl instance
- * as resolved at the appropriate point in the resolution processing
- *
- */
-public class WebImplementationGeneratedProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WebImplementationGeneratedImpl> {
-
- public WebImplementationGeneratedProcessor(ExtensionPointRegistry registry,
- Monitor monitor) {
- }
-
- public QName getArtifactType() {
- return null;
- }
-
- public Class<WebImplementationGeneratedImpl> getModelType() {
- // Returns the type of model processed by this processor
- return WebImplementationGeneratedImpl.class;
- }
-
- public WebImplementationGeneratedImpl read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
- return null;
- }
-
- public void resolve(WebImplementationGeneratedImpl implementation, ModelResolver resolver) throws ContributionResolveException {
- implementation.setUnresolved(false);
- }
-
- public void write(WebImplementationGeneratedImpl implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
- }
-}
diff --git a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java b/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
deleted file mode 100644
index ceca698356..0000000000
--- a/branches/sca-java-1.5.2/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
+++ /dev/null
@@ -1,109 +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.contribution.jee.impl;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo;
-import org.apache.tuscany.sca.contribution.jee.EnvEntryInfo;
-import org.apache.tuscany.sca.contribution.jee.JspReferenceTagInfo;
-import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
-
-public class WebModuleInfoImpl implements WebModuleInfo {
-
- private URI uri;
- private String moduleName;
- private ClassLoader moduleClassLoader;
-
- private Collection<Class<?>> servletClasses = new ArrayList<Class<?>>();
- private Collection<Class<?>> listenerClasses = new ArrayList<Class<?>>();
- private Collection<Class<?>> filterClasses = new ArrayList<Class<?>>();
- private Collection<Class<?>> jsfClasses = new ArrayList<Class<?>>();
-
- private Collection<JspReferenceTagInfo> jspReferenceTags = new ArrayList<JspReferenceTagInfo>();
-
- private Map<String, EjbReferenceInfo> ejbReferences = new HashMap<String, EjbReferenceInfo>();
- private Map<String, EnvEntryInfo> envEntries = new HashMap<String, EnvEntryInfo>();
-
- public WebModuleInfoImpl() {
- }
- public Collection<Class<?>> getServletClasses() {
- return servletClasses;
- }
-
- public Collection<Class<?>> getListenerClasses() {
- return listenerClasses;
- }
-
- public Collection<Class<?>> getFilterClasses() {
- return filterClasses;
- }
-
- public Collection<Class<?>> getJSFClasses() {
- return jsfClasses;
- }
-
- public Collection<JspReferenceTagInfo> getJspReferenceTags() {
- return jspReferenceTags;
- }
-
- public EjbReferenceInfo getEjbReference(String ejbRefName) {
- return ejbReferences.get(ejbRefName);
- }
-
- public Map<String, EjbReferenceInfo> getEjbReferences() {
- return ejbReferences;
- }
-
- public Map<String, EnvEntryInfo> getEnvEntries() {
- return envEntries;
- }
-
- public EnvEntryInfo getEnvEntry(String envEntryName) {
- return envEntries.get(envEntryName);
- }
-
- public String getModuleName() {
- return moduleName;
- }
-
- public void setModuleName(String moduleName) {
- this.moduleName = moduleName;
- }
-
- public URI getUri() {
- return uri;
- }
-
- public void setUri(URI uri) {
- this.uri = uri;
- }
-
- public ClassLoader getModuleClassloader() {
- return moduleClassLoader;
- }
-
- public void setmoduleClassloader(ClassLoader classLoader) {
- this.moduleClassLoader = classLoader;
- }
-}