Author: ito
Date: Sun Jan 31 17:15:14 2010
New Revision: 905075
URL: http://svn.apache.org/viewvc?rev=905075&view=rev
Log:
JaxRs tests added
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/
(props changed)
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
Propchange:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jan 31 17:15:14 2010
@@ -1,2 +1,3 @@
target
.project
+.log.log.swp
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=905075&r1=905074&r2=905075&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
Sun Jan 31 17:15:14 2010
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<artifactId>org.apache.clerezza.parent</artifactId>
<groupId>org.apache.clerezza</groupId>
@@ -21,8 +22,36 @@
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.rdf.core</artifactId>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>com.hp.hpl.jena</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <version>1.0.0</version>
+ <artifactId>org.apache.felix.log</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <scope>provided</scope>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <scope>provided</scope>
+ <version>1.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jmxri</artifactId>
+ <groupId>com.sun.jmx</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jmxtools</artifactId>
+ <groupId>com.sun.jdmk</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
@@ -50,6 +79,263 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>org.apache.felix.scr.annotations</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang-osgi</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang-osgi</groupId>
+ <artifactId>scala-compiler</artifactId>
+ <version>${scala.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.utils.customproperty</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.triaxrs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.utils</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.jena.facade</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.jena.commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.jena.storage</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.jena.sparql</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.jena.parser</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.rdfjson</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.ontologies</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.content</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.graphprovider.content</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.dashboard.ontologies</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.dashboard.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.web.fileserver</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.jaxrs.rdf.providers</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.web.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.web.ontologies</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.typehandlerspace</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.mail</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.scala</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.templating</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.templating.seedsnipe</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.jaxrs.utils</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.jaxrs.extensions</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.typerendering.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.typerendering.ontologies</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.typerendering.seedsnipe</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.typerendering.manager</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.scripting</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.scripting.scriptmanager</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.xhtml2html</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.web.resources.jquery</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.web.resources.yui</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.utils.imageprocessing</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.web.resources.scripts</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.web.resources.style</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.typerendering.scalaserverpages</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.scala.utils</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.config</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.documentation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.documentation.viewer</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.menumanager</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.language</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.app.webguiexamples</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- pax exam related stuff -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
@@ -85,12 +371,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit-extender-impl</artifactId>
<version>1.2.1-SNAPSHOT</version>
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=905075&r1=905074&r2=905075&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
Sun Jan 31 17:15:14 2010
@@ -34,12 +34,17 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import junit.framework.Assert;
+import org.apache.clerezza.platform.scripting.scriptmanager.ScriptManager;
import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.clerezza.web.resources.jquery.JQuery;
+import org.apache.clerezza.web.resources.scripts.Scripts;
import org.junit.Before;
import org.junit.Test;
import org.ops4j.pax.exam.Inject;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
/**
@@ -57,6 +62,14 @@
"org.osgi.core").versionAsInProject(),
mavenBundle().groupId("org.osgi").artifactId(
"org.osgi.compendium").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
+ "com.hp.hpl.jena").versionAsInProject(),
+
mavenBundle().groupId("org.apache.felix").artifactId(
+ "org.apache.felix.log").versionAsInProject(),
+
mavenBundle().groupId("org.ops4j.pax.logging").artifactId(
+ "pax-logging-api").versionAsInProject(),
+
mavenBundle().groupId("org.ops4j.pax.logging").artifactId(
+ "pax-logging-service").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.rdf.core").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
@@ -77,12 +90,92 @@
"org.apache.felix.eventadmin").version("1.0.0"),
mavenBundle().groupId("org.apache.felix").artifactId(
"org.apache.felix.metatype").version("1.0.2"),
- /*dsProfile(),*/
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.triaxrs").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
+ "javax.mail").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
+ "org.json.simple").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.rdf.utils").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.jaxrs.rdf.providers").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.jaxrs.utils").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.rdf.ontologies").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.config").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.graphprovider.content").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.templating").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.scala").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.typerendering.scalaserverpages").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.rdf.scala.utils").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.typerendering.ontologies").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.typerendering.core").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.templating.seedsnipe").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.typerendering.seedsnipe").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.mail").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.utils.customproperty").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.dashboard.core").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.dashboard.ontologies").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.web.fileserver").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.content").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.typehandlerspace").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.web.resources.jquery").startLevel(4).versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.usermanager").startLevel(4).versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.scripting").startLevel(4).versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.rdf.jena.sparql").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.rdf.jena.parser").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.rdf.jena.serializer").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.rdf.rdfjson").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.rdf.web.ontologies").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.rdf.web.core").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.typerendering.manager").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.scripting.scriptmanager").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.xhtml2html").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.web.resources.yui").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.utils.imageprocessing").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.menumanager").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.language").versionAsInProject(),
+ //dsProfile(),
configProfile(),
webProfile(),
junitBundles(),
frameworks(
- felix().version("2.0.1")),
+ felix().version("2.0.2")),
systemProperty("org.osgi.service.http.port").value(
Integer.toString(testHttpPort)));
}
@@ -106,8 +199,22 @@
Assert.assertTrue(webServerExist);
Object service = waitFor(TcManager.class, 20000);
Assert.assertTrue(service != null);
+
+ }
+
+ @Test
+ public void checkJaxRsServices()
+ throws Exception {
+ Assert.assertTrue(webServerExist);
+ Object service = waitFor(JQuery.class, 20000);
+ Assert.assertTrue(service != null);
+ service = waitFor(Scripts.class, 20000);
+ Assert.assertTrue(service != null);
+ service = waitFor(ScriptManager.class, 20000);
+ Assert.assertTrue(service != null);
}
+
private Object waitFor(Class<?> aClass, long timeout)
throws InterruptedException {
ServiceTracker tracker = new ServiceTracker(bundleContext,
