From e6e918ef537c4aa9802ca27b92e1dc566c2cffda Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 16 Feb 2012 15:38:34 +0000 Subject: Delete old RC tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1245033 13f79535-47bb-0310-9956-ffa450edef68 --- .../osgi/impl/OSGiImplementationFactoryImpl.java | 125 --------------------- .../osgi/impl/OSGiImplementationImpl.java | 124 -------------------- .../implementation/osgi/impl/OSGiPropertyImpl.java | 69 ------------ .../implementation/osgi/impl/SCAConfigImpl.java | 58 ---------- .../osgi/impl/ServiceDescriptionImpl.java | 51 --------- .../osgi/impl/ServiceDescriptionsFactoryImpl.java | 48 -------- .../osgi/impl/ServiceDescriptionsImpl.java | 36 ------ 7 files changed, 511 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java (limited to 'sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl') diff --git a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java deleted file mode 100644 index 17ebf12903..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.implementation.osgi.impl; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation; -import org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory; -import org.apache.tuscany.sca.implementation.osgi.OSGiProperty; -import org.osgi.framework.ServiceReference; - -/** - * - */ -public class OSGiImplementationFactoryImpl implements OSGiImplementationFactory { - public OSGiImplementationFactoryImpl(ExtensionPointRegistry registry) { - super(); - } - - public OSGiImplementation createOSGiImplementation() { - return new OSGiImplementationImpl(); - } - - public OSGiProperty createOSGiProperty() { - return new OSGiPropertyImpl(); - } - - public OSGiProperty createOSGiProperty(String propName, String propValue, String propType) { - OSGiProperty prop = new OSGiPropertyImpl(); - if (propType == null) { - propType = "String"; - } - prop.setName(propName); - prop.setStringValue(propValue); - prop.setType(propType); - - Object value = propValue; - if ("Integer".equals(propType)) { - value = Integer.valueOf(propValue); - } else if ("Long".equals(propType)) { - value = Long.valueOf(propValue); - } else if ("Float".equals(propType)) { - value = Float.valueOf(propValue); - } else if ("Double".equals(propType)) { - value = Double.valueOf(propValue); - } else if ("Short".equals(propType)) { - value = Short.valueOf(propValue); - } else if ("Character".equals(propType)) { - value = propValue.charAt(0); - } else if ("Byte".equals(propType)) { - value = Byte.valueOf(propValue); - } else if ("Boolean".equals(propType)) { - value = Boolean.valueOf(propValue); - } else if ("String+".equals(propType)) { - value = propValue.split(" "); - } else { - // String - value = propValue; - } - prop.setValue(value); - return prop; - } - - public OSGiProperty createOSGiProperty(String propName, Object value) { - OSGiProperty prop = new OSGiPropertyImpl(); - prop.setName(propName); - prop.setValue(value); - - if (value instanceof String[]) { - StringBuffer sb = new StringBuffer(); - for (String s : (String[])value) { - sb.append(s).append(' '); - } - if (sb.length() > 0) { - sb.deleteCharAt(sb.length() - 1); - } - prop.setStringValue(sb.toString()); - prop.setType("String+"); - } else if (value != null) { - prop.setStringValue(String.valueOf(value)); - prop.setType(value.getClass().getSimpleName()); - } - return prop; - } - - public Collection createOSGiProperties(ServiceReference reference) { - List props = new ArrayList(); - for(String key: reference.getPropertyKeys()) { - Object value = reference.getProperty(key); - OSGiProperty prop = createOSGiProperty(key, value); - props.add(prop); - } - return props; - } - - public Collection createOSGiProperties(Map properties) { - List props = new ArrayList(); - for (Map.Entry e : properties.entrySet()) { - OSGiProperty prop = createOSGiProperty(e.getKey(), e.getValue()); - props.add(prop); - } - return props; - } -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java deleted file mode 100644 index 4e89cbb7d3..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.implementation.osgi.impl; - -import org.apache.tuscany.sca.assembly.impl.ImplementationImpl; -import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation; -import org.osgi.framework.Bundle; -import org.osgi.framework.Constants; - -/** - * OSGi implementation - * All attributes from have getters in this class - * This class implements OSGiImplementationInterface which is associated with OSGiImplementationProvider. - * - * @version $Rev$ $Date$ - */ -public class OSGiImplementationImpl extends ImplementationImpl implements OSGiImplementation { - - private String bundleSymbolicName; - private String bundleVersion; - private Bundle osgiBundle; - - protected OSGiImplementationImpl() { - super(TYPE); - } - - public OSGiImplementationImpl(String bundleSymbolicName, String bundleVersion) { - super(TYPE); - this.bundleSymbolicName = bundleSymbolicName; - this.bundleVersion = bundleVersion; - } - - public String getBundleSymbolicName() { - return bundleSymbolicName; - } - - public String getBundleVersion() { - return bundleVersion; - } - - /** - * Since OSGi implementation annotations may not be processed until much later, leave it to - * the OSGi invoker to decide whether pass-by-reference is allowed. - * @return - */ - public boolean isAllowsPassByReference() { - return true; - } - - public Bundle getBundle() { - return osgiBundle; - } - - public void setBundle(Bundle osgiBundle) { - this.osgiBundle = osgiBundle; - if (osgiBundle != null) { - this.bundleSymbolicName = osgiBundle.getSymbolicName(); - this.bundleVersion = (String)osgiBundle.getHeaders().get(Constants.BUNDLE_VERSION); - } - } - - public void setBundleSymbolicName(String bundleSymbolicName) { - this.bundleSymbolicName = bundleSymbolicName; - } - - public void setBundleVersion(String bundleVersion) { - this.bundleVersion = bundleVersion; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = super.hashCode(); - result = prime * result + ((bundleSymbolicName == null) ? 0 : bundleSymbolicName.hashCode()); - result = prime * result + ((bundleVersion == null) ? 0 : bundleVersion.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!super.equals(obj)) { - return false; - } - if (!(obj instanceof OSGiImplementationImpl)) { - return false; - } - OSGiImplementationImpl other = (OSGiImplementationImpl)obj; - if (bundleSymbolicName == null) { - if (other.bundleSymbolicName != null) { - return false; - } - } else if (!bundleSymbolicName.equals(other.bundleSymbolicName)) { - return false; - } - if (bundleVersion == null) { - if (other.bundleVersion != null) { - return false; - } - } else if (!bundleVersion.equals(other.bundleVersion)) { - return false; - } - return true; - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java b/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java deleted file mode 100644 index b3e934a970..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.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.implementation.osgi.impl; - -import org.apache.tuscany.sca.implementation.osgi.OSGiProperty; - -/** - * Implementation of OSGiProperty - */ -public class OSGiPropertyImpl implements OSGiProperty { - private String name; - private String type; - private Object value; - private String stringValue; - - public OSGiPropertyImpl() { - super(); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Object getValue() { - return value; - } - - public void setValue(Object value) { - this.value = value; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getStringValue() { - return stringValue; - } - - public void setStringValue(String stringValue) { - this.stringValue = stringValue; - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java b/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java deleted file mode 100644 index 4bb1b2340f..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.implementation.osgi.impl; - -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.implementation.osgi.SCAConfig; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicySet; - -/** - * - */ -public class SCAConfigImpl implements SCAConfig { - private String targetNamespace = null; - private List intents = new CopyOnWriteArrayList(); - private List policySets = new CopyOnWriteArrayList(); - private List bindings = new CopyOnWriteArrayList(); - - public List getIntents() { - return intents; - } - - public List getPolicySets() { - return policySets; - } - - public String getTargetNamespace() { - return targetNamespace; - } - - public void setTargetNamespace(String ns) { - this.targetNamespace = ns; - } - - public List getBindings() { - return bindings; - } -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java b/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java deleted file mode 100644 index 5bd1d17253..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.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.implementation.osgi.impl; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.implementation.osgi.ServiceDescription; -import org.osgi.framework.Constants; - -/** - * The OSGi RFC 119 description of a remote OSGi service - */ -public class ServiceDescriptionImpl implements ServiceDescription { - private Map properties = new HashMap(); - - protected ServiceDescriptionImpl() { - super(); - } - - public List getInterfaces() { - return Arrays.asList((String[])properties.get(Constants.OBJECTCLASS)); - } - - public Map getProperties() { - return properties; - } - - public String toString() { - return "endpoint-description: " + properties; - } -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java b/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java deleted file mode 100644 index 716984a13b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.implementation.osgi.impl; - -import org.apache.tuscany.sca.implementation.osgi.SCAConfig; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescription; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptions; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory; - -/** - * The factory implementation - */ -public class ServiceDescriptionsFactoryImpl implements ServiceDescriptionsFactory { - - protected ServiceDescriptionsFactoryImpl() { - super(); - } - - public ServiceDescription createServiceDescription() { - return new ServiceDescriptionImpl(); - } - - public ServiceDescriptions createServiceDescriptions() { - return new ServiceDescriptionsImpl(); - } - - public SCAConfig createSCAConfig() { - return new SCAConfigImpl(); - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java b/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java deleted file mode 100644 index c249c053a4..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.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.implementation.osgi.impl; - -import java.util.ArrayList; - -import org.apache.tuscany.sca.implementation.osgi.ServiceDescription; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptions; - -/** - * - */ -public class ServiceDescriptionsImpl extends ArrayList implements ServiceDescriptions { - private static final long serialVersionUID = 6205649013621747968L; - - protected ServiceDescriptionsImpl() { - super(); - } -} -- cgit v1.2.3