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 2011/03/26 11:31:56 UTC
svn commit: r1085680 - in /aries/trunk/samples-sandbox/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-assembly/
goat-assembly/src/main/filtered-resources/configu...
Author: zoe
Date: Sat Mar 26 10:31:56 2011
New Revision: 1085680
URL: http://svn.apache.org/viewvc?rev=1085680&view=rev
Log:
ARIES-616 Is working again. Baseline for refactoring.
Added:
aries/trunk/samples-sandbox/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/packageinfo
aries/trunk/samples-sandbox/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/packageinfo
Modified:
aries/trunk/samples-sandbox/goat/goat-api/pom.xml
aries/trunk/samples-sandbox/goat/goat-assembly/pom.xml
aries/trunk/samples-sandbox/goat/goat-assembly/src/main/filtered-resources/configuration/config.ini
Modified: aries/trunk/samples-sandbox/goat/goat-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-api/pom.xml?rev=1085680&r1=1085679&r2=1085680&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-api/pom.xml (original)
+++ aries/trunk/samples-sandbox/goat/goat-api/pom.xml Sat Mar 26 10:31:56 2011
@@ -40,21 +40,4 @@
<aries.osgi.private.pkg />
</properties>
-<!--
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <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>
- </plugins>
- </build>
--->
</project>
Added: aries/trunk/samples-sandbox/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/packageinfo?rev=1085680&view=auto
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/packageinfo (added)
+++ aries/trunk/samples-sandbox/goat/goat-api/src/main/java/org/apache/aries/samples/goat/api/packageinfo Sat Mar 26 10:31:56 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 1.0.0
Added: aries/trunk/samples-sandbox/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/packageinfo?rev=1085680&view=auto
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/packageinfo (added)
+++ aries/trunk/samples-sandbox/goat/goat-api/src/main/java/org/apache/aries/samples/goat/info/packageinfo Sat Mar 26 10:31:56 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 1.0.0
Modified: aries/trunk/samples-sandbox/goat/goat-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-assembly/pom.xml?rev=1085680&r1=1085679&r2=1085680&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-assembly/pom.xml (original)
+++ aries/trunk/samples-sandbox/goat/goat-assembly/pom.xml Sat Mar 26 10:31:56 2011
@@ -29,14 +29,16 @@
<dependencies>
- <!--not sure about this one -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </dependency>
+
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>1.0.0</version>
- </dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ </dependency>
- <!-- Base (JDBC) platform dependencies -->
<dependency>
<groupId>org.eclipse</groupId>
@@ -78,17 +80,14 @@
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
</dependency>
-
- <!-- Base (JDBC) Aries dependencies -->
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/trunk/samples-sandbox/goat/goat-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-assembly/src/main/filtered-resources/configuration/config.ini?rev=1085680&r1=1085679&r2=1085680&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ aries/trunk/samples-sandbox/goat/goat-assembly/src/main/filtered-resources/configuration/config.ini Sat Mar 26 10:31:56 2011
@@ -15,35 +15,35 @@
# specific language governing permissions and limitations
# under the License.
osgi.bundles=\
-m-3.2.0-v20070116.jar@start,\
-services-3.1.200-v20070605.jar@start,\
-pax-logging-api-1.4.jar@start,\
-pax-logging-service-1.4.jar@start,\
-derby-10.5.3.0_1.jar@start,\
-pax-web-jetty-bundle-0.7.2.jar@start,\
-pax-web-extender-war-0.7.2.jar@start,\
-pax-web-jsp-0.7.2.jar@start,\
+cm-${cmVersion}.jar@start,\
+services-${servicesVersion}.jar@start,\
+asm-all-${asmVersion}.jar@start,\
+pax-logging-api-${paxLoggingApiVersion}.jar@start,\
+pax-logging-service-${paxLoggingServiceVersion}.jar@start,\
+pax-web-jetty-bundle-${paxWebJettyBundleVersion}.jar@start,\
+pax-web-extender-war-${paxWebExtenderWarVersion}.jar@start,\
+pax-web-jsp-${paxWebJspVersion}.jar@start,\
org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
org.apache.aries.util-${ariesUtilVersion}.jar@start,\
+org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
-org.apache.aries.application.install-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.management-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.api-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.utils-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.deployment.management-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.modeller-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.resolver.noop-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.noop.platform.repo-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.noop.postresolve.process-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.default.local.platform-${ariesApplicationVersion}.jar@start,\
-org.apache.felix.fileinstall-2.0.8.jar@start,\
-org.apache.aries.application.runtime-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.samples.goat.api-${version}@start,\
-org.apache.aries.samples.goat.web-${version}.jar@start,\
-org.apache.aries.samples.goat.dummy-${version}.jar@start,\
-org.apache.aries.samples.goat.dummy2-${version}.jar@start,\
-org.apache.aries.samples.goat.bundlecontextmodel-${version}.jar@start,\
-org.apache.aries.samples.goat.info.enhancer-${version}.jar@start
+org.apache.aries.application.install-${ariesApplicationInstallVersion}.jar@start,\
+org.apache.aries.application.management-${ariesApplicationManagementVersion}.jar@start,\
+org.apache.aries.application.api-${ariesApplicationApiVersion}.jar@start,\
+org.apache.aries.application.utils-${ariesApplicationUtilsVersion}.jar@start,\
+org.apache.aries.application.deployment.management-${ariesApplicationDeploymentManagementVersion}.jar@start,\
+org.apache.aries.application.modeller-${ariesApplicationModellerVersion}.jar@start,\
+org.apache.aries.application.resolver.noop-${ariesApplicationNoopResolverVersion}.jar@start,\
+org.apache.aries.application.default.local.platform-${ariesApplicationDefaultLocalPlatformVersion}.jar@start,\
+org.apache.aries.application.runtime-${ariesApplicationRuntimeVersion}.jar@start,\
+geronimo-servlet_2.5_spec-1.2.jar@start,\
+org.apache.felix.fileinstall-${felixFileinstallVersion}.jar@start,\
+org.apache.aries.samples.goat.api-${project.version}@start,\
+org.apache.aries.samples.goat.web-${project.version}.jar@start,\
+org.apache.aries.samples.goat.dummy-${project.version}.jar@start,\
+org.apache.aries.samples.goat.dummy2-${project.version}.jar@start,\
+org.apache.aries.samples.goat.bundlecontextmodel-${project.version}.jar@start,\
+org.apache.aries.samples.goat.info.enhancer-${project.version}.jar@start
eclipse.ignoreApp=true
org.ops4j.pax.logging.DefaultServiceLog.level=INFO
org.osgi.framework.system.packages=javax.accessibility,\