Author: ito
Date: Tue Feb 2 09:39:59 2010
New Revision: 905552
URL: http://svn.apache.org/viewvc?rev=905552&view=rev
Log:
platform.language dep replace with platform.language.core and scriptmanager
removed from test.
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml?rev=905552&r1=905551&r2=905552&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
Tue Feb 2 09:39:59 2010
@@ -327,7 +327,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.platform.language</artifactId>
+
<artifactId>org.apache.clerezza.platform.language.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java?rev=905552&r1=905551&r2=905552&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
Tue Feb 2 09:39:59 2010
@@ -169,13 +169,13 @@
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.menumanager").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
-
"org.apache.clerezza.platform.language").versionAsInProject(),
+
"org.apache.clerezza.platform.language.core").versionAsInProject(),
//dsProfile(),
configProfile(),
webProfile(),
junitBundles(),
frameworks(
- felix().version("2.0.2")),
+ felix()),
systemProperty("org.osgi.service.http.port").value(
Integer.toString(testHttpPort)));
}
@@ -210,8 +210,6 @@
Assert.assertTrue(service != null);
service = waitFor(Scripts.class, 20000);
Assert.assertTrue(service != null);
- service = waitFor(ScriptManager.class, 20000);
- Assert.assertTrue(service != null);
}