You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2010/07/04 22:30:45 UTC
svn commit: r960390 - in /incubator/aries/trunk/samples/goat: goat-api/
goat-api/src/main/java/org/apache/aries/samples/goat/api/
goat-api/src/main/java/org/apache/aries/samples/goat/info/
goat-bundlecontext-modelprovider/src/main/java/org/apache/aries...
Author: zoe
Date: Sun Jul 4 20:30:44 2010
New Revision: 960390
URL: http://svn.apache.org/viewvc?rev=960390&view=rev
Log:
ARIES-347 Fixed properly
Added:
incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/
incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/ComponentInfoImpl.java
- copied, changed from r960365, 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/info/RelationshipInfoImpl.java
- copied, changed from r960365, incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/RelationshipInfoImpl.java
Removed:
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-api/pom.xml
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/pom.xml
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
Modified: incubator/aries/trunk/samples/goat/goat-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-api/pom.xml?rev=960390&r1=960389&r2=960390&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-api/pom.xml (original)
+++ incubator/aries/trunk/samples/goat/goat-api/pom.xml Sun Jul 4 20:30:44 2010
@@ -36,7 +36,8 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.aries.samples.goat.api.*; version=${project.version}</Export-Package>
+ <Export-Package>org.apache.aries.samples.goat.api; version=${project.version},
+ org.apache.aries.samples.goat.info;version=${project.version} </Export-Package>
</instructions>
</configuration>
</plugin>
Copied: incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/ComponentInfoImpl.java (from r960365, 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/info/ComponentInfoImpl.java?p2=incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/ComponentInfoImpl.java&p1=incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/ComponentInfoImpl.java&r1=960365&r2=960390&rev=960390&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/ComponentInfoImpl.java (original)
+++ incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/ComponentInfoImpl.java Sun Jul 4 20:30:44 2010
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.samples.goat.api;
+package org.apache.aries.samples.goat.info;
import java.util.List;
import java.util.Map;
+import org.apache.aries.samples.goat.api.ComponentInfo;
public class ComponentInfoImpl implements ComponentInfo {
Copied: incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/RelationshipInfoImpl.java (from r960365, 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/info/RelationshipInfoImpl.java?p2=incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/RelationshipInfoImpl.java&p1=incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/RelationshipInfoImpl.java&r1=960365&r2=960390&rev=960390&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/RelationshipInfoImpl.java (original)
+++ incubator/aries/trunk/samples/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/RelationshipInfoImpl.java Sun Jul 4 20:30:44 2010
@@ -16,8 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.samples.goat.api;
+package org.apache.aries.samples.goat.info;
import java.util.List;
+import org.apache.aries.samples.goat.api.RelationshipInfo;
+import org.apache.aries.samples.goat.api.RelationshipAspect;
+import org.apache.aries.samples.goat.api.ComponentInfo;;
public class RelationshipInfoImpl implements RelationshipInfo {
List<ComponentInfo> consumedBy;
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=960390&r1=960389&r2=960390&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 20:30:44 2010
@@ -35,8 +35,10 @@ 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.api.ComponentInfoImpl;
-import org.apache.aries.samples.goat.api.RelationshipInfoImpl;
+
+import org.apache.aries.samples.goat.info.ComponentInfoImpl;
+import org.apache.aries.samples.goat.info.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/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-dummy-provider/pom.xml?rev=960390&r1=960389&r2=960390&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-dummy-provider/pom.xml (original)
+++ incubator/aries/trunk/samples/goat/goat-dummy-provider/pom.xml Sun Jul 4 20:30:44 2010
@@ -33,10 +33,6 @@
<groupId>org.apache.aries.samples.goat</groupId>
<artifactId>org.apache.aries.samples.goat.api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.aries.samples.goat</groupId>
- <artifactId>org.apache.aries.samples.goat.web</artifactId>
- </dependency>
</dependencies>
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=960390&r1=960389&r2=960390&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 20:30:44 2010
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.aries.samples.goat.api.ComponentInfoImpl;
+import org.apache.aries.samples.goat.info.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=960390&r1=960389&r2=960390&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 20:30:44 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.api.RelationshipInfoImpl;
+import org.apache.aries.samples.goat.info.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=960390&r1=960389&r2=960390&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 20:30:44 2010
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.aries.samples.goat.api.ComponentInfoImpl;
+import org.apache.aries.samples.goat.info.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=960390&r1=960389&r2=960390&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 20:30:44 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.api.RelationshipInfoImpl;
+import org.apache.aries.samples.goat.info.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=960390&r1=960389&r2=960390&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 20:30:44 2010
@@ -30,8 +30,9 @@ 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.api.ComponentInfoImpl;
-import org.apache.aries.samples.goat.api.RelationshipInfoImpl;
+
+import org.apache.aries.samples.goat.info.ComponentInfoImpl;
+import org.apache.aries.samples.goat.info.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=960390&r1=960389&r2=960390&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/pom.xml (original)
+++ incubator/aries/trunk/samples/goat/goat-web/pom.xml Sun Jul 4 20:30:44 2010
@@ -94,6 +94,7 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Private-Package>org.apache.aries.samples.goat.web.*</Private-Package>
<Import-Package>
+ org.apache.aries.samples.goat.info,
javax.imageio,
javax.jms,
javax.servlet,
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=960390&r1=960389&r2=960390&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 20:30:44 2010
@@ -25,13 +25,15 @@ import java.util.Map;
import javax.servlet.ServletContext;
+import org.apache.aries.samples.goat.info.ComponentInfoImpl;
+import org.apache.aries.samples.goat.info.RelationshipInfoImpl;
+
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;
import org.directwebremoting.ScriptSession;
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=960390&r1=960389&r2=960390&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 20:30:44 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.api.ComponentInfoImpl" javascript="ComponentInfo"/>
- <convert converter="bean" match="org.apache.aries.samples.goat.api.RelationshipInfoImpl" javascript="RelationshipInfo"/>
+ <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"/>
</allow>
</dwr>