incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r960365 - in /incubator/aries/trunk/samples/goat: goat-api/src/main/java/org/apache/aries/samples/goat/api/ goat-bundlecontext-modelprovider/src/main/java/org/apache/aries/samples/goat/bundlecontextmodel/ goat-dummy-provider/src/main/java/o...
Date Sun, 04 Jul 2010 17:25:46 GMT
Author: zoe
Date: Sun Jul  4 17:25:45 2010
New Revision: 960365

URL: http://svn.apache.org/viewvc?rev=960365&view=rev
Log:
ARIES-347 Moved classes

Added:
    incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/ComponentInfoImpl.java
    incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/RelationshipInfoImpl.java
Modified:
    incubator/aries/trunk/samples/goat/goat-bundlecontext-modelprovider/src/main/java/org/apache/aries/samples/goat/bundlecontextmodel/BundleContextInfoProvider.java
    incubator/aries/trunk/samples/goat/goat-dummy-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyInfoProvider.java
    incubator/aries/trunk/samples/goat/goat-dummy-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyRelationshipProvider.java
    incubator/aries/trunk/samples/goat/goat-dummy2-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyInfoProvider.java
    incubator/aries/trunk/samples/goat/goat-dummy2-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyRelationshipProvider.java
    incubator/aries/trunk/samples/goat/goat-info-enhancer/src/main/java/org/apache/aries/samples/goat/enhancer/ModelInfoEnhancerService.java
    incubator/aries/trunk/samples/goat/goat-web/pom.xml
    incubator/aries/trunk/samples/goat/goat-web/src/main/java/org/apache/aries/samples/goat/web/ServerSideClass.java
    incubator/aries/trunk/samples/goat/goat-web/src/main/resources/WEB-INF/dwr.xml

Added: incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/ComponentInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/ComponentInfoImpl.java?rev=960365&view=auto
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/ComponentInfoImpl.java
(added)
+++ incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/ComponentInfoImpl.java
Sun Jul  4 17:25:45 2010
@@ -0,0 +1,48 @@
+/**
+ * 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.aries.samples.goat.api;
+
+import java.util.List;
+import java.util.Map;
+
+public class ComponentInfoImpl implements ComponentInfo {
+
+	List<ComponentInfo> children;
+	Map<String,String> componentProperties;
+	String id;
+	public List<ComponentInfo> getChildren() {
+		return children;
+	}
+	public void setChildren(List<ComponentInfo> children) {
+		this.children = children;
+	}
+	public Map<String, String> getComponentProperties() {
+		return componentProperties;
+	}
+	public void setComponentProperties(Map<String, String> componentProperties) {
+		this.componentProperties = componentProperties;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+}

Added: incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/RelationshipInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/RelationshipInfoImpl.java?rev=960365&view=auto
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/RelationshipInfoImpl.java
(added)
+++ incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/RelationshipInfoImpl.java
Sun Jul  4 17:25:45 2010
@@ -0,0 +1,59 @@
+/**
+ * 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.aries.samples.goat.api;
+import java.util.List;
+
+public class RelationshipInfoImpl implements RelationshipInfo {
+	List<ComponentInfo> consumedBy;
+	List<RelationshipAspect> relationshipAspects;
+	String name;
+	ComponentInfo providedBy;
+	String type;
+	public List<ComponentInfo> getConsumedBy() {
+		return consumedBy;
+	}
+	public void setConsumedBy(List<ComponentInfo> consumedBy) {
+		this.consumedBy = consumedBy;
+	}
+	public List<RelationshipAspect> getRelationshipAspects() {
+		return relationshipAspects;
+	}
+	public void setRelationshipAspects(List<RelationshipAspect> relationshipAspects) {
+		this.relationshipAspects = relationshipAspects;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public ComponentInfo getProvidedBy() {
+		return providedBy;
+	}
+	public void setProvidedBy(ComponentInfo providedBy) {
+		this.providedBy = providedBy;
+	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	
+}

Modified: incubator/aries/trunk/samples/goat/goat-bundlecontext-modelprovider/src/main/java/org/apache/aries/samples/goat/bundlecontextmodel/BundleContextInfoProvider.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-bundlecontext-modelprovider/src/main/java/org/apache/aries/samples/goat/bundlecontextmodel/BundleContextInfoProvider.java?rev=960365&r1=960364&r2=960365&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-bundlecontext-modelprovider/src/main/java/org/apache/aries/samples/goat/bundlecontextmodel/BundleContextInfoProvider.java
(original)
+++ incubator/aries/trunk/samples/goat/goat-bundlecontext-modelprovider/src/main/java/org/apache/aries/samples/goat/bundlecontextmodel/BundleContextInfoProvider.java
Sun Jul  4 17:25:45 2010
@@ -35,8 +35,8 @@ import org.osgi.framework.ServiceListene
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.packageadmin.ExportedPackage;
 import org.osgi.service.packageadmin.PackageAdmin;
-import org.apache.aries.samples.goat.info.ComponentInfoImpl;
-import org.apache.aries.samples.goat.info.RelationshipInfoImpl;
+import org.apache.aries.samples.goat.api.ComponentInfoImpl;
+import org.apache.aries.samples.goat.api.RelationshipInfoImpl;
 import org.apache.aries.samples.goat.api.ComponentInfo;
 import org.apache.aries.samples.goat.api.ComponentInfoProvider;
 import org.apache.aries.samples.goat.api.ModelInfoService;

Modified: incubator/aries/trunk/samples/goat/goat-dummy-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyInfoProvider.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-dummy-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyInfoProvider.java?rev=960365&r1=960364&r2=960365&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-dummy-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyInfoProvider.java
(original)
+++ incubator/aries/trunk/samples/goat/goat-dummy-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyInfoProvider.java
Sun Jul  4 17:25:45 2010
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.aries.samples.goat.info.ComponentInfoImpl;
+import org.apache.aries.samples.goat.api.ComponentInfoImpl;
 
 import org.apache.aries.samples.goat.api.ComponentInfo;
 import org.apache.aries.samples.goat.api.ComponentInfoProvider;

Modified: incubator/aries/trunk/samples/goat/goat-dummy-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyRelationshipProvider.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-dummy-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyRelationshipProvider.java?rev=960365&r1=960364&r2=960365&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-dummy-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyRelationshipProvider.java
(original)
+++ incubator/aries/trunk/samples/goat/goat-dummy-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyRelationshipProvider.java
Sun Jul  4 17:25:45 2010
@@ -21,7 +21,7 @@ package org.apache.aries.samples.goat.du
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.aries.samples.goat.info.RelationshipInfoImpl;
+import org.apache.aries.samples.goat.api.RelationshipInfoImpl;
 
 import org.apache.aries.samples.goat.api.ComponentInfo;
 import org.apache.aries.samples.goat.api.ComponentInfoProvider;

Modified: incubator/aries/trunk/samples/goat/goat-dummy2-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyInfoProvider.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-dummy2-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyInfoProvider.java?rev=960365&r1=960364&r2=960365&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-dummy2-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyInfoProvider.java
(original)
+++ incubator/aries/trunk/samples/goat/goat-dummy2-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyInfoProvider.java
Sun Jul  4 17:25:45 2010
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.aries.samples.goat.info.ComponentInfoImpl;
+import org.apache.aries.samples.goat.api.ComponentInfoImpl;
 
 import org.apache.aries.samples.goat.api.ComponentInfo;
 import org.apache.aries.samples.goat.api.ComponentInfoProvider;

Modified: incubator/aries/trunk/samples/goat/goat-dummy2-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyRelationshipProvider.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-dummy2-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyRelationshipProvider.java?rev=960365&r1=960364&r2=960365&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-dummy2-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyRelationshipProvider.java
(original)
+++ incubator/aries/trunk/samples/goat/goat-dummy2-provider/src/main/java/org/apache/aries/samples/goat/dummy/DummyRelationshipProvider.java
Sun Jul  4 17:25:45 2010
@@ -21,7 +21,7 @@ package org.apache.aries.samples.goat.du
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.aries.samples.goat.info.RelationshipInfoImpl;
+import org.apache.aries.samples.goat.api.RelationshipInfoImpl;
 
 import org.apache.aries.samples.goat.api.ComponentInfo;
 import org.apache.aries.samples.goat.api.ComponentInfoProvider;

Modified: incubator/aries/trunk/samples/goat/goat-info-enhancer/src/main/java/org/apache/aries/samples/goat/enhancer/ModelInfoEnhancerService.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-info-enhancer/src/main/java/org/apache/aries/samples/goat/enhancer/ModelInfoEnhancerService.java?rev=960365&r1=960364&r2=960365&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-info-enhancer/src/main/java/org/apache/aries/samples/goat/enhancer/ModelInfoEnhancerService.java
(original)
+++ incubator/aries/trunk/samples/goat/goat-info-enhancer/src/main/java/org/apache/aries/samples/goat/enhancer/ModelInfoEnhancerService.java
Sun Jul  4 17:25:45 2010
@@ -30,8 +30,8 @@ import org.apache.aries.samples.goat.api
 import org.apache.aries.samples.goat.api.ModelInfoService;
 import org.apache.aries.samples.goat.api.RelationshipInfo;
 import org.apache.aries.samples.goat.api.RelationshipInfoProvider;
-import org.apache.aries.samples.goat.info.ComponentInfoImpl;
-import org.apache.aries.samples.goat.info.RelationshipInfoImpl;
+import org.apache.aries.samples.goat.api.ComponentInfoImpl;
+import org.apache.aries.samples.goat.api.RelationshipInfoImpl;
 
 public class ModelInfoEnhancerService implements ModelInfoService,
 		ComponentInfoProvider, RelationshipInfoProvider,

Modified: incubator/aries/trunk/samples/goat/goat-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-web/pom.xml?rev=960365&r1=960364&r2=960365&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/pom.xml (original)
+++ incubator/aries/trunk/samples/goat/goat-web/pom.xml Sun Jul  4 17:25:45 2010
@@ -93,7 +93,6 @@
 						<Web-ContextPath>/</Web-ContextPath>
 						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 						<Private-Package>org.apache.aries.samples.goat.web.*</Private-Package>
-						<Export-Package>org.apache.aries.samples.goat.info;version=${project.version}</Export-Package>

 						<Import-Package>
 							javax.imageio,
 							javax.jms,

Modified: incubator/aries/trunk/samples/goat/goat-web/src/main/java/org/apache/aries/samples/goat/web/ServerSideClass.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-web/src/main/java/org/apache/aries/samples/goat/web/ServerSideClass.java?rev=960365&r1=960364&r2=960365&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/src/main/java/org/apache/aries/samples/goat/web/ServerSideClass.java
(original)
+++ incubator/aries/trunk/samples/goat/goat-web/src/main/java/org/apache/aries/samples/goat/web/ServerSideClass.java
Sun Jul  4 17:25:45 2010
@@ -26,9 +26,11 @@ import java.util.Map;
 import javax.servlet.ServletContext;
 
 import org.apache.aries.samples.goat.api.ComponentInfo;
+import org.apache.aries.samples.goat.api.ComponentInfoImpl;
 import org.apache.aries.samples.goat.api.ComponentInfoProvider;
 import org.apache.aries.samples.goat.api.ModelInfoService;
 import org.apache.aries.samples.goat.api.RelationshipInfo;
+import org.apache.aries.samples.goat.api.RelationshipInfoImpl;
 import org.apache.aries.samples.goat.api.RelationshipInfoProvider;
 import org.directwebremoting.Browser;
 import org.directwebremoting.ScriptBuffer;

Modified: incubator/aries/trunk/samples/goat/goat-web/src/main/resources/WEB-INF/dwr.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-web/src/main/resources/WEB-INF/dwr.xml?rev=960365&r1=960364&r2=960365&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/src/main/resources/WEB-INF/dwr.xml (original)
+++ incubator/aries/trunk/samples/goat/goat-web/src/main/resources/WEB-INF/dwr.xml Sun Jul
 4 17:25:45 2010
@@ -22,7 +22,7 @@
     <create creator="new" scope="application">
       <param name="class" value="org.apache.aries.samples.goat.web.ServerSideClass"/>
     </create>
-	<convert converter="bean" match="org.apache.aries.samples.goat.info.ComponentInfoImpl"
javascript="ComponentInfo"/>          
-	<convert converter="bean" match="org.apache.aries.samples.goat.info.RelationshipInfoImpl"
javascript="RelationshipInfo"/> 
+	<convert converter="bean" match="org.apache.aries.samples.goat.api.ComponentInfoImpl"
javascript="ComponentInfo"/>          
+	<convert converter="bean" match="org.apache.aries.samples.goat.api.RelationshipInfoImpl"
javascript="RelationshipInfo"/> 
   </allow>
 </dwr>



Mime
View raw message