You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2012/11/28 14:28:27 UTC
svn commit: r1414670 - in /incubator/clerezza/trunk: ./ jaxrs.testutils/
jaxrs.utils/ jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/
maven-pladoc-plugin/maven-pladoc-plugin.core/
maven-pladoc-plugin/maven-pladoc-plugin.service/ maven-pladoc...
Author: reto
Date: Wed Nov 28 13:28:12 2012
New Revision: 1414670
URL: http://svn.apache.org/viewvc?rev=1414670&view=rev
Log:
CLEREZZA-720: Clerezza platform now on wink, triaxrs discontinued
Removed:
incubator/clerezza/trunk/jaxrs.testutils/
incubator/clerezza/trunk/platform.security/
incubator/clerezza/trunk/platform.security.auth.basic/
incubator/clerezza/trunk/platform.security.auth.cookie/
incubator/clerezza/trunk/platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginListener.java
incubator/clerezza/trunk/triaxrs/
Modified:
incubator/clerezza/trunk/jaxrs.utils/pom.xml
incubator/clerezza/trunk/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/MultiPartFormMBRTest.java
incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml
incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.service/pom.xml
incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java
incubator/clerezza/trunk/parent/pom.xml
incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/MenuItemProvider.scala
incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala
incubator/clerezza/trunk/platform.concepts/platform.concepts.core/pom.xml
incubator/clerezza/trunk/platform.concepts/platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java
incubator/clerezza/trunk/platform.content/pom.xml
incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.java
incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/WebDavUtils.java
incubator/clerezza/trunk/platform.dashboard.webinterface/pom.xml
incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/pom.xml
incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
incubator/clerezza/trunk/platform.dashboard/platform.dashboard.tests/pom.xml
incubator/clerezza/trunk/platform.graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/GraphNodeProvider.scala
incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml
incubator/clerezza/trunk/platform.mail/pom.xml
incubator/clerezza/trunk/platform.mail/src/main/java/org/apache/clerezza/platform/mail/MailManPermission.java
incubator/clerezza/trunk/platform.mail/src/test/java/org/apache/clerezza/platform/mail/MailManPermissionTest.java
incubator/clerezza/trunk/platform.testing/pom.xml
incubator/clerezza/trunk/platform.typehandlerspace/pom.xml
incubator/clerezza/trunk/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpace.java
incubator/clerezza/trunk/platform.typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java
incubator/clerezza/trunk/platform.typepriority/pom.xml
incubator/clerezza/trunk/platform.typerendering/platform.typerendering.core/pom.xml
incubator/clerezza/trunk/platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
incubator/clerezza/trunk/platform.usermanager/pom.xml
incubator/clerezza/trunk/platform.users/core/pom.xml
incubator/clerezza/trunk/platform.users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
incubator/clerezza/trunk/platform.xhtml2html/pom.xml
incubator/clerezza/trunk/pom.xml
incubator/clerezza/trunk/rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
incubator/clerezza/trunk/rdf.core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml
incubator/clerezza/trunk/rdf.simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java
incubator/clerezza/trunk/sshshell/pom.xml
incubator/clerezza/trunk/sshshell/src/main/java/org/apache/clerezza/sshshell/SshShell.java
incubator/clerezza/trunk/uima/uima.concept-tagging/pom.xml
incubator/clerezza/trunk/uima/uima.metadata-generator/pom.xml
incubator/clerezza/trunk/uima/uima.samples/pom.xml
Modified: incubator/clerezza/trunk/jaxrs.utils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/jaxrs.utils/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/jaxrs.utils/pom.xml (original)
+++ incubator/clerezza/trunk/jaxrs.utils/pom.xml Wed Nov 28 13:28:12 2012
@@ -47,10 +47,13 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+ <!-- testing with last released version, testutils is doscontinued as
+ triaxrs is -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.testutils</artifactId>
<scope>test</scope>
+ <version>0.9-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
Modified: incubator/clerezza/trunk/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/MultiPartFormMBRTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/MultiPartFormMBRTest.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/MultiPartFormMBRTest.java (original)
+++ incubator/clerezza/trunk/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/MultiPartFormMBRTest.java Wed Nov 28 13:28:12 2012
@@ -30,7 +30,6 @@ import org.junit.Test;
import org.apache.clerezza.jaxrs.utils.form.FormFile;
import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
import org.apache.clerezza.jaxrs.utils.form.MultiPartFormMessageBodyReader;
-import org.apache.clerezza.triaxrs.delegate.RuntimeDelegateImpl;
/**
* @author mir
@@ -50,7 +49,7 @@ public class MultiPartFormMBRTest {
@Test
public void testMultiPartForm() throws Exception {
- RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
+ //RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
StringBuilder sb = new StringBuilder();
sb.append("--AaB03x\r\n");
sb.append("Content-Disposition: form-data; name=\""+ paramName1 +"\"\r\n");
Modified: incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml (original)
+++ incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml Wed Nov 28 13:28:12 2012
@@ -102,16 +102,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>osgi_R4_compendium</artifactId>
- <groupId>org.osgi</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.parser</artifactId>
<!-- <scope>provided</scope> -->
</dependency>
Modified: incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.service/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.service/pom.xml (original)
+++ incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.service/pom.xml Wed Nov 28 13:28:12 2012
@@ -51,8 +51,8 @@
<!-- <scope>provided</scope> -->
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified: incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java (original)
+++ incubator/clerezza/trunk/maven-pladoc-plugin/maven-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java Wed Nov 28 13:28:12 2012
@@ -45,7 +45,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.clerezza.rdf.ontologies.DISCOBITS;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
-import org.wymiwyg.wrhapi.Handler;
+
/**
*
@@ -62,8 +62,9 @@ public class GeneratorServiceImpl implem
/**
* this is just to activate Triaxrs in order for MediaType to work
*/
- @Reference
- Handler triaxrs;
+ //TODO find the wink way to ensure this
+ /*@Reference
+ Handler triaxrs;*/
protected void activate(ComponentContext componentContext) {
System.out.println("activating generator service");
Modified: incubator/clerezza/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/pom.xml (original)
+++ incubator/clerezza/trunk/parent/pom.xml Wed Nov 28 13:28:12 2012
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>12</version>
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>clerezza</artifactId>
@@ -642,16 +642,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.testutils</artifactId>
- <version>0.10-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>platform</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
</dependency>
@@ -830,11 +820,11 @@
<artifactId>rdf.sesame.storage</artifactId>
<version>0.13-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security</artifactId>
<version>0.9-incubating-SNAPSHOT</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.conditions</artifactId>
@@ -842,29 +832,19 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security.auth.basic</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>platform.users.core</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security.auth.cookie</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>platform.typehandlerspace</artifactId>
<version>0.9-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.foafssl.core</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.foafssl.test</artifactId>
@@ -887,26 +867,6 @@
</dependency>
<dependency>
<groupId>org.wymiwyg</groupId>
- <artifactId>jetty-osgi-httpservice</artifactId>
- <version>0.1</version>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi-osgi</artifactId>
- <version>0.4.2</version>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi-jetty</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
<artifactId>wymiwyg-commons-core</artifactId>
<version>0.7.6</version>
</dependency>
Modified: incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml (original)
+++ incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml Wed Nov 28 13:28:12 2012
@@ -121,10 +121,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.seedsnipe</artifactId>
</dependency>
<dependency>
Modified: incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/MenuItemProvider.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/MenuItemProvider.scala?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/MenuItemProvider.scala (original)
+++ incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/MenuItemProvider.scala Wed Nov 28 13:28:12 2012
@@ -34,7 +34,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service
import org.apache.clerezza.platform.dashboard.GlobalMenuItem
import org.apache.clerezza.platform.dashboard.GlobalMenuItemsProvider
-import org.apache.clerezza.platform.security.UserUtil
+import org.apache.stanbol.commons.security.UserUtil
/**
*
Modified: incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala (original)
+++ incubator/clerezza/trunk/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala Wed Nov 28 13:28:12 2012
@@ -90,7 +90,6 @@ import org.apache.clerezza.rdf.ontologie
import org.apache.clerezza.rdf.ontologies.RDF
import org.apache.clerezza.rdf.utils.GraphNode
import org.apache.clerezza.rdf.utils.UnionMGraph
-import org.apache.clerezza.triaxrs.prefixmanager.TriaxrsPrefixManager
object SettingPanel {
val logger: Logger = LoggerFactory.getLogger(classOf[SettingsPanel])
@@ -296,7 +295,7 @@ class SettingsPanel {
private def addBundlePrefix(bundle: Bundle, prefix: String): Unit = {
var symbolicName: String = bundle.getSymbolicName
- if (configAdmin != null) {
+ /*if (configAdmin != null) {
try {
var configuration: Configuration = configAdmin.getConfiguration(classOf[TriaxrsPrefixManager].getName)
val properties = configuration.getProperties match {
@@ -318,12 +317,12 @@ class SettingsPanel {
}
else {
logger.warn("Cannot add prefix mapping. Configuration Admin is missing")
- }
+ }*/
}
private[accountcontrolpanel] def removeBundlePrefix(bundle: Bundle): Unit = {
var symbolicName: String = bundle.getSymbolicName
- if ((this.configAdmin != null) && (symbolicName != null)) {
+ /*if ((this.configAdmin != null) && (symbolicName != null)) {
try {
val configuration: Configuration = configAdmin.getConfiguration(classOf[TriaxrsPrefixManager].getName)
val properties = configuration.getProperties match {
@@ -344,7 +343,7 @@ class SettingsPanel {
}
else {
logger.warn("Cannot add prefix mapping. Configuration Admin is missing")
- }
+ }*/
}
/**
Modified: incubator/clerezza/trunk/platform.concepts/platform.concepts.core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.concepts/platform.concepts.core/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.concepts/platform.concepts.core/pom.xml (original)
+++ incubator/clerezza/trunk/platform.concepts/platform.concepts.core/pom.xml Wed Nov 28 13:28:12 2012
@@ -89,15 +89,14 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>web.fileserver</artifactId>
- <version>0.10-incubating-SNAPSHOT</version>
- <type>bundle</type>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-common</artifactId>
+ <version>1.2.1-incubating</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: incubator/clerezza/trunk/platform.concepts/platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.concepts/platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.concepts/platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java (original)
+++ incubator/clerezza/trunk/platform.concepts/platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java Wed Nov 28 13:28:12 2012
@@ -21,6 +21,7 @@ package org.apache.clerezza.platform.con
import java.util.Arrays;
import java.util.List;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.RuntimeDelegate;
import org.apache.clerezza.platform.concepts.ontologies.CONCEPTS;
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.rdf.core.Graph;
@@ -28,6 +29,7 @@ import org.apache.clerezza.rdf.core.MGra
import org.apache.clerezza.rdf.core.access.LockableMGraph;
import org.apache.clerezza.rdf.core.access.LockableMGraphWrapper;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.wink.common.internal.runtime.RuntimeDelegateImpl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -61,6 +63,7 @@ public class ConceptProviderManagerTest
@Before
public void setUp() {
+ RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
testedConceptProviderManager = new TestedConceptProviderManager();
testedConceptProviderManager.cgProvider = new ContentGraphProvider() {
Modified: incubator/clerezza/trunk/platform.content/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.content/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.content/pom.xml (original)
+++ incubator/clerezza/trunk/platform.content/pom.xml Wed Nov 28 13:28:12 2012
@@ -72,10 +72,6 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphnodeprovider</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.usermanager</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.seedsnipe</artifactId>
@@ -106,10 +102,10 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security</artifactId>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scalaserverpages</artifactId>
Modified: incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java (original)
+++ incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java Wed Nov 28 13:28:12 2012
@@ -86,7 +86,6 @@ import org.osgi.service.component.Compon
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.wymiwyg.wrhapi.HeaderName;
/**
* This Class allows getting and putting content structured using the
@@ -98,9 +97,9 @@ import org.wymiwyg.wrhapi.HeaderName;
* @author reto, tho, agron, mir
*/
@Component(metatype=true)
-@Services({
- @Service(Object.class),
- @Service(DiscobitsHandler.class)
+@Service({
+ Object.class,
+ DiscobitsHandler.class
})
@Property(name="org.apache.clerezza.platform.typehandler", boolValue=true)
@Reference(name="metaDataGenerator",
@@ -468,7 +467,7 @@ public class DiscobitsTypeHandler extend
return resourceUnavailable(nodeUri, uriInfo);
}
Response.ResponseBuilder builder = Response.ok();
- builder.header(HeaderName.DAV.toString(), "1");
+ builder.header("Dav", "1");
Set<String> allow = new HashSet<String>();
Method[] methods = this.getClass().getMethods();
for (Method method : methods) {
@@ -480,7 +479,7 @@ public class DiscobitsTypeHandler extend
}
}
if (allow.isEmpty()) {
- builder.header(HeaderName.ALLOW.toString(), "");
+ builder.header("Allow", "");
} else {
final Iterator<String> iterator = allow.iterator();
final StringBuffer buffer = new StringBuffer(iterator.next());
@@ -488,7 +487,7 @@ public class DiscobitsTypeHandler extend
buffer.append(", ");
buffer.append(iterator.next());
}
- builder.header(HeaderName.ALLOW.toString(), buffer.toString());
+ builder.header("Allow", buffer.toString());
}
return builder.build();
}
Modified: incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.java (original)
+++ incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.java Wed Nov 28 13:28:12 2012
@@ -28,6 +28,7 @@ import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
@@ -149,6 +150,8 @@ public class Editor extends FileServer {
}
@GET
+ //this is to work around
+ @Produces(MediaType.APPLICATION_OCTET_STREAM)
public PathNode getStaticFile(@Context UriInfo uriInfo) {
TrailingSlash.enforcePresent(uriInfo);
final PathNode node = getNode("disco.xhtml");
Modified: incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/WebDavUtils.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/WebDavUtils.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/WebDavUtils.java (original)
+++ incubator/clerezza/trunk/platform.content/src/main/java/org/apache/clerezza/platform/content/WebDavUtils.java Wed Nov 28 13:28:12 2012
@@ -56,7 +56,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.wymiwyg.wrhapi.HeaderName;
/**
*
@@ -174,7 +173,7 @@ class WebDavUtils {
*/
static Response options(Class<?> clazz){
Response.ResponseBuilder builder = Response.ok();
- builder.header(HeaderName.DAV.toString(), "1");
+ builder.header("Dav", "1");
Set<String> allow = new HashSet<String>();
Method[] methods = clazz.getMethods();
for (Method method : methods){
@@ -187,7 +186,7 @@ class WebDavUtils {
}
}
if (allow.isEmpty()) {
- builder.header(HeaderName.ALLOW.toString(), "");
+ builder.header("Allow", "");
} else {
final Iterator<String> iterator = allow.iterator();
final StringBuffer buffer = new StringBuffer(iterator.next());
@@ -195,7 +194,7 @@ class WebDavUtils {
buffer.append(", ");
buffer.append(iterator.next());
}
- builder.header(HeaderName.ALLOW.toString(), buffer.toString());
+ builder.header("Allow", buffer.toString());
}
return builder.build();
}
Modified: incubator/clerezza/trunk/platform.dashboard.webinterface/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.dashboard.webinterface/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.dashboard.webinterface/pom.xml (original)
+++ incubator/clerezza/trunk/platform.dashboard.webinterface/pom.xml Wed Nov 28 13:28:12 2012
@@ -40,10 +40,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- </dependency>
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
Modified: incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/pom.xml (original)
+++ incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/pom.xml Wed Nov 28 13:28:12 2012
@@ -41,10 +41,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- </dependency>
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
@@ -80,6 +76,11 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.security</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java (original)
+++ incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java Wed Nov 28 13:28:12 2012
@@ -18,8 +18,7 @@
*/
package org.apache.clerezza.platform.dashboard;
-import org.apache.clerezza.platform.security.UserUtil;
-import org.apache.clerezza.platform.security.WebIdBasedPermissionProvider;
+import org.apache.stanbol.commons.security.UserUtil;
import org.apache.clerezza.platform.typerendering.UserContextProvider;
import org.apache.clerezza.platform.usermanager.UserManager;
import org.apache.clerezza.platform.users.WebIdGraphsService;
Modified: incubator/clerezza/trunk/platform.dashboard/platform.dashboard.tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.dashboard/platform.dashboard.tests/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.dashboard/platform.dashboard.tests/pom.xml (original)
+++ incubator/clerezza/trunk/platform.dashboard/platform.dashboard.tests/pom.xml Wed Nov 28 13:28:12 2012
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -141,11 +136,6 @@
</dependency>
<dependency>
<groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
<artifactId>wymiwyg-commons-core</artifactId>
<scope>provided</scope>
</dependency>
@@ -186,11 +176,6 @@
<version>6.1.12</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi-osgi</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
<artifactId>com.ibm.icu</artifactId>
Modified: incubator/clerezza/trunk/platform.graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/GraphNodeProvider.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/GraphNodeProvider.scala?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/GraphNodeProvider.scala (original)
+++ incubator/clerezza/trunk/platform.graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/GraphNodeProvider.scala Wed Nov 28 13:28:12 2012
@@ -61,20 +61,36 @@ class GraphNodeProvider extends Logging
def getLocal(uriRef: UriRef): GraphNode = {
get(uriRef, true)
}
-
+
+
+ /**
+ *return true iff getLocal(uriRef).getNodeContext.size > 0
+ */
+ def existsLocal(uriRef: UriRef): Boolean = {
+ val cgGraph = cgProvider.getContentGraph
+ lazy val localInstanceUri = {
+ val uri = new java.net.URI(uriRef.getUnicodeString)
+ new UriRef(Constants.URN_LOCAL_INSTANCE + uri.getPath)
+ }
+ //TODO handle /user/
+ existsInGraph(uriRef,cgGraph) || existsInGraph(localInstanceUri, cgGraph)
+ }
+
+ private[this] def existsInGraph(nodeUri: UriRef, tc: LockableMGraph): Boolean = {
+ var readLock: Lock = tc.getLock.readLock
+ readLock.lock
+ try {
+ return tc.filter(nodeUri, null, null).hasNext || tc.filter(null, null, nodeUri).hasNext
+ }
+ finally {
+ readLock.unlock
+ }
+ }
+
+
private def get(uriRef: UriRef, isLocal: Boolean): GraphNode = {
val uriString = uriRef.getUnicodeString
- def existsInGraph(nodeUri: UriRef, tc: LockableMGraph): Boolean =
- {
- var readLock: Lock = tc.getLock.readLock
- readLock.lock
- try {
- return tc.filter(nodeUri, null, null).hasNext || tc.filter(null, null, nodeUri).hasNext
- }
- finally {
- readLock.unlock
- }
- }
+
val uriPath = {
val uri = new java.net.URI(uriString)
Modified: incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml (original)
+++ incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml Wed Nov 28 13:28:12 2012
@@ -273,7 +273,7 @@
<scope>provided</scope>
<version>0.7.2</version>
</dependency> -->
- <dependency>
+ <!-- <dependency>
<groupId>org.wymiwyg</groupId>
<artifactId>jetty-osgi-httpservice</artifactId>
<scope>provided</scope>
@@ -332,7 +332,17 @@
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
<version>3.0.20100224</version>
- </dependency>
+ </dependency> -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.whiteboard</artifactId>
+ <version>2.2.0</version>
+ </dependency>
<!-- Apache Felix framework bundles -->
<dependency>
<groupId>org.apache.felix</groupId>
Modified: incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml (original)
+++ incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml Wed Nov 28 13:28:12 2012
@@ -46,16 +46,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi-osgi</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.clerezza.ext</groupId>
<artifactId>com.hp.hpl.jena</artifactId>
<scope>runtime</scope>
@@ -205,13 +195,18 @@
<artifactId>platform.accountcontrolpanel.ontologies</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <!-- this has to start early, because of the MEdiaType requiring RuntimeImpl in
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-osgi</artifactId>
+ <version>1.2.1-incubating</version>
+ <!-- this has to start early, because of the MEdiaType requiring RuntimeImpl in
static iinitializer -->
- <scope>provided</scope>
- </dependency>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.utils</artifactId>
@@ -370,17 +365,17 @@
<artifactId>rdf.web.ontologies</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security</artifactId>
<scope>runtime</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.conditions</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.foafssl.core</artifactId>
<scope>runtime</scope>
@@ -409,7 +404,27 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.auth.cookie</artifactId>
<scope>runtime</scope>
- </dependency>
+ </dependency> -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.security</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.authentication.basic</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.security.fexilwebconsole</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.usermanagement</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typehandlerspace</artifactId>
@@ -560,7 +575,7 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.style.classic.webguiexamples</artifactId>
<scope>runtime</scope>
- </dependency>
+ </dependency>wr
-->
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified: incubator/clerezza/trunk/platform.mail/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.mail/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.mail/pom.xml (original)
+++ incubator/clerezza/trunk/platform.mail/pom.xml Wed Nov 28 13:28:12 2012
@@ -60,9 +60,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security</artifactId>
- </dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.security</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>permissiondescriptions</artifactId>
Modified: incubator/clerezza/trunk/platform.mail/src/main/java/org/apache/clerezza/platform/mail/MailManPermission.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.mail/src/main/java/org/apache/clerezza/platform/mail/MailManPermission.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.mail/src/main/java/org/apache/clerezza/platform/mail/MailManPermission.java (original)
+++ incubator/clerezza/trunk/platform.mail/src/main/java/org/apache/clerezza/platform/mail/MailManPermission.java Wed Nov 28 13:28:12 2012
@@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.clerezza.platform.security.UserUtil;
+import org.apache.stanbol.commons.security.UserUtil;
/**
* A permission to send e-mails as a specific user.
Modified: incubator/clerezza/trunk/platform.mail/src/test/java/org/apache/clerezza/platform/mail/MailManPermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.mail/src/test/java/org/apache/clerezza/platform/mail/MailManPermissionTest.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.mail/src/test/java/org/apache/clerezza/platform/mail/MailManPermissionTest.java (original)
+++ incubator/clerezza/trunk/platform.mail/src/test/java/org/apache/clerezza/platform/mail/MailManPermissionTest.java Wed Nov 28 13:28:12 2012
@@ -23,7 +23,7 @@ import java.security.PrivilegedAction;
import java.util.Collections;
import javax.security.auth.Subject;
import org.junit.Test;
-import org.apache.clerezza.platform.security.auth.PrincipalImpl;
+import org.apache.stanbol.commons.security.auth.PrincipalImpl;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
Modified: incubator/clerezza/trunk/platform.testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.testing/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.testing/pom.xml (original)
+++ incubator/clerezza/trunk/platform.testing/pom.xml Wed Nov 28 13:28:12 2012
@@ -89,10 +89,6 @@
</dependency>
<dependency>
<groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
<artifactId>wymiwyg-commons-core</artifactId>
</dependency>
<dependency>
@@ -128,11 +124,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>permissiondescriptions</artifactId>
<scope>provided</scope>
</dependency>
@@ -401,10 +392,7 @@
<artifactId>pax-exam-container-default</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi-osgi</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
<artifactId>com.ibm.icu</artifactId>
Modified: incubator/clerezza/trunk/platform.typehandlerspace/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.typehandlerspace/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.typehandlerspace/pom.xml (original)
+++ incubator/clerezza/trunk/platform.typehandlerspace/pom.xml Wed Nov 28 13:28:12 2012
@@ -83,11 +83,32 @@
<artifactId>jaxrs.rdf.providers</artifactId>
<scope>test</scope>
</dependency>
+ <!-- testing with last released version, testutils is doscontinued as
+ triaxrs is -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.testutils</artifactId>
<scope>test</scope>
+ <version>0.9-incubating</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-osgi</artifactId>
+ <version>1.2.1-incubating</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.graphnodeprovider</artifactId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: incubator/clerezza/trunk/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpace.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpace.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpace.java (original)
+++ incubator/clerezza/trunk/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpace.java Wed Nov 28 13:28:12 2012
@@ -18,10 +18,13 @@
*/
package org.apache.clerezza.platform.typehandlerspace;
+import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.locks.Lock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -29,9 +32,20 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.Request;
import javax.ws.rs.core.UriInfo;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.clerezza.jaxrs.extensions.ResourceMethodException;
import org.apache.clerezza.jaxrs.extensions.RootResourceExecutor;
import org.apache.clerezza.platform.Constants;
+import org.apache.clerezza.platform.graphnodeprovider.GraphNodeProvider;
+import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.Resource;
import org.apache.clerezza.rdf.core.Triple;
@@ -40,6 +54,12 @@ import org.apache.clerezza.rdf.core.acce
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.wink.osgi.WinkRequestProcessor;
/**
@@ -51,29 +71,62 @@ import org.apache.clerezza.rdf.utils.Gra
* resource, that is registered with TypeHandlerDiscovery to handle a specific
* rdf-type.
*
- * @author mir, agron
*
- * @scr.component
- * @scr.service interface="java.lang.Object"
- * @scr.property name="javax.ws.rs" type="Boolean" value="true"
- */
-@Path("/")
-public class TypeHandlerSpace {
+ */
+@Component(immediate = true, metatype = false)
+@Service(value = javax.servlet.Filter.class)
+@Properties({
+ @Property(name ="pattern", value=".*"),
+ @Property(name ="service.ranking", intValue=100)
+
+})
+public class TypeHandlerSpace implements Filter {
- /**
- * @scr.reference
- */
- TcManager tcManager;
+ @Reference
+ GraphNodeProvider gnp;
- /**
- * @scr.reference cardinality "1..1"
- */
+ @Reference
TypeHandlerDiscovery typeHandlerDiscovery;
+ @Reference
+ private WinkRequestProcessor winkProvider;
+
private final String DESCRIPTION_SUFFIX = "-description";
private DescriptionHandler descriptionHandler = new DescriptionHandler();
+
+ public void init(FilterConfig filterConfig) throws ServletException {
+ //no initialization needed
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
+ if (request instanceof HttpServletRequest) {
+ doFilter((HttpServletRequest)request, (HttpServletResponse)response, chain);
+ } else {
+ chain.doFilter(request, response);
+ }
+ }
+
+ public void doFilter(HttpServletRequest request, HttpServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
+ try {
+ Object resource = getTypeHandler(request.getRequestURL().toString());
+ if (resource != null) {
+ winkProvider.handleRequest(request, response, resource);
+ } else {
+ chain.doFilter(request, response);
+ }
+ } catch (ResourceMethodException ex) {
+ throw new ServletException(ex);
+ }
+
+ }
+
+ public void destroy() {
+ //not
+ }
/**
* Returns a TypeHandler according the most important rdf-type of the
@@ -84,7 +137,7 @@ public class TypeHandlerSpace {
* @return
* @throws ResourceMethodException
*/
- @Path("{path:.*}")
+ /*@Path("{path:.*}")
public Object getHandler(@Context UriInfo uriInfo,
@Context Request request) throws ResourceMethodException {
String absoluteUriPath = uriInfo.getAbsolutePath().toString();
@@ -94,39 +147,39 @@ public class TypeHandlerSpace {
}
}
return getTypeHandler(absoluteUriPath);
- }
+ }*/
private Object getTypeHandler(String absoluteUriPath) throws ResourceMethodException {
- LockableMGraph contentMGraph = tcManager.getMGraph(Constants.CONTENT_GRAPH_URI);
UriRef uri = new UriRef(absoluteUriPath);
-
- Set<UriRef> rdfTypes = getRdfTypesOfUriRef(contentMGraph, uri);
-
- return typeHandlerDiscovery.getTypeHandler(rdfTypes);
-
+ if (gnp.existsLocal(uri)) {
+ GraphNode node = gnp.getLocal(uri);
+ Lock lock =node.readLock();
+ lock.lock();
+ try {
+ Set<UriRef> rdfTypes = getRdfTypesOfUriRef(node);
+ return typeHandlerDiscovery.getTypeHandler(rdfTypes);
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ return null;
}
- private Set<UriRef> getRdfTypesOfUriRef(LockableMGraph contentMGraph, UriRef uri) {
+ private Set<UriRef> getRdfTypesOfUriRef(GraphNode node) {
Set<UriRef> rdfTypes = new HashSet<UriRef>();
- Lock readLock = contentMGraph.getLock().readLock();
- readLock.lock();
- try {
- Iterator<Triple> typeStmts = contentMGraph.filter(uri, RDF.type, null);
-
- while (typeStmts.hasNext()) {
- Triple triple = typeStmts.next();
- Resource typeStmtObj = triple.getObject();
- if (!(typeStmtObj instanceof UriRef)) {
- throw new RuntimeException(
- "RDF type is expected to be a URI but is " + typeStmtObj
- + "(in " + triple + ")");
- }
- UriRef rdfType = (UriRef) typeStmtObj;
- rdfTypes.add(rdfType);
- }
- } finally {
- readLock.unlock();
- }
+ Iterator<Resource> types = node.getObjects(RDF.type);
+ while (types.hasNext()) {
+ Resource typeStmtObj = types.next();
+ if (!(typeStmtObj instanceof UriRef)) {
+ throw new RuntimeException(
+ "RDF type is expected to be a URI but is " + typeStmtObj
+ + "(of " + node.getNode() + ")");
+ }
+ UriRef rdfType = (UriRef) typeStmtObj;
+ rdfTypes.add(rdfType);
+ }
+
return rdfTypes;
}
@@ -135,10 +188,10 @@ public class TypeHandlerSpace {
@GET
public Object getDescription(@Context UriInfo uriInfo){
String absoluteUriPath = uriInfo.getAbsolutePath().toString();
- MGraph contentMGraph = tcManager.getMGraph(Constants.CONTENT_GRAPH_URI);
+ //MGraph contentMGraph = cgp.getContentGraph();
UriRef uri = new UriRef(absoluteUriPath.substring(0,
absoluteUriPath.length() - DESCRIPTION_SUFFIX.length()));
- GraphNode graphNode = new GraphNode(uri, contentMGraph);
+ GraphNode graphNode = gnp.getLocal(uri);
return graphNode.getNodeContext();
}
}
Modified: incubator/clerezza/trunk/platform.typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java (original)
+++ incubator/clerezza/trunk/platform.typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java Wed Nov 28 13:28:12 2012
@@ -58,269 +58,274 @@ import org.apache.clerezza.rdf.ontologie
*
*/
public class TypeHandlerSpaceTest {
-
- private static LockableMGraph mGraph = new LockableMGraphWrapper(new SimpleMGraph());
-
- UriRef myType = new UriRef("org.example/myType");
-
- @Path("/myTypeHandler")
- public static class MyTypeHandler {
-
- @GET
- public String handleGet() {
- return "handleGet";
- }
-
- @PUT
- @POST
- public String handlePut() {
- return "handlePut";
- }
- }
-
- @Path("/myTypeHandler2")
- public static class MyTypeHandler2 {
-
- @GET
- public String handleGet() {
- return "handleGet2";
- }
-
- @PUT
- public String handlePut() {
- return "handlePut2";
- }
- }
-
- /**
- * Tests if the correct method of the correct TypeHandler is called,
- * when using the http-method PUT.
- */
+
@Test
- public void testPut() throws IOException {
-
- int port = createTestWebServer().getPort();
-
- UriRef uri = new UriRef("http://localhost:" + port + "/test");
- // Setup mGraph
- Triple triple = new TripleImpl(uri, RDF.type, myType);
- mGraph.add(triple);
-
- URL serverURL = new URL(uri.getUnicodeString());
- HttpURLConnection connection = (HttpURLConnection) serverURL.openConnection();
- connection.setDoOutput(true);
- connection.setRequestMethod("PUT");
- connection.addRequestProperty("Content-type", "application/x-test");
- //java sends and invalid *; q=.2 in the default accept-header
- connection.addRequestProperty("Accept", "*/*; q=.2");
- OutputStream requestStream = connection.getOutputStream();
- byte[] putData = {1, 6, 8};
- requestStream.write(putData);
- requestStream.flush();
- //now we actually open the connection
- connection.connect();
-
- InputStream requestInput = connection.getInputStream();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- for (int ch = requestInput.read(); ch != -1; ch = requestInput.read()) {
- baos.write(ch);
- }
- Assert.assertEquals("handlePut", baos.toString());
- }
-
- /**
- * Tests if the correct method of the correct TypeHandler is called,
- * when using the http-method GET.
- */
- @Test
- public void testGet() throws IOException {
-
- int port = createTestWebServer().getPort();
- UriRef uri = new UriRef("http://localhost:" + port + "/test");
-
- // Setup mGraph
- Triple triple = new TripleImpl(uri, RDF.type, myType);
- mGraph.add(triple);
-
- URL serverURL = new URL(uri.getUnicodeString());
- HttpURLConnection connection = (HttpURLConnection) serverURL.openConnection();
-
- connection = (HttpURLConnection) serverURL.openConnection();
- connection.setRequestMethod("GET");
-
- connection.addRequestProperty("Accept", "text/html, */*; q=.2");
- InputStream requestInput = connection.getInputStream();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- for (int ch = requestInput.read(); ch != -1; ch = requestInput.read()) {
- baos.write(ch);
- }
- Assert.assertEquals("handleGet", baos.toString());
- }
-
- /**
- * Tests if the correct description of the resource is returned when
- * request with "-description" appended to the URL.
- */
- @Test
- public void testGetDescription() throws IOException {
-
- int port = createTestWebServer().getPort();
- UriRef uri = new UriRef("http://localhost:" + port + "/test");
-
- // Setup mGraph
- Triple triple = new TripleImpl(uri, RDF.type, myType);
- mGraph.add(triple);
-
- URL serverURL = new URL(uri.getUnicodeString() + "-description");
- HttpURLConnection connection = (HttpURLConnection) serverURL.openConnection();
-
- connection = (HttpURLConnection) serverURL.openConnection();
- connection.setRequestMethod("GET");
-
- connection.addRequestProperty("Accept", "text/html, */*; q=.2");
- InputStream requestInput = connection.getInputStream();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- for (int ch = requestInput.read(); ch != -1; ch = requestInput.read()) {
- baos.write(ch);
- }
- Assert.assertEquals("Graph writer", baos.toString());
- }
-
- private TestWebServer createTestWebServer() {
- return new TestWebServer(new Application() {
-
- @Override
- public Set<Class<?>> getClasses() {
- Set<Class<?>> result = new HashSet<Class<?>>();
- return result;
- }
-
- @Override
- public Set<Object> getSingletons() {
- Set<Object> result = new HashSet<Object>();
- final MyTypeHandler typeHandler = new MyTypeHandler();
- final MyTypeHandler2 fallbackHandler = new MyTypeHandler2();
-
- TypeHandlerSpace typeHandlerSpace = new TypeHandlerSpace();
- typeHandlerSpace.tcManager = new TcManager(){
- @Override
- public LockableMGraph getMGraph(UriRef name) {
- return new LockableMGraph() {
-
- @Override
- public ReadWriteLock getLock() {
- return mGraph.getLock();
- }
-
- @Override
- public Graph getGraph() {
- return mGraph.getGraph();
- }
-
- @Override
- public Iterator<Triple> filter(NonLiteral subject, UriRef predicate, Resource object) {
- return mGraph.filter(subject, predicate, object);
- }
-
- @Override
- public int size() {
- return mGraph.size();
- }
-
- @Override
- public boolean isEmpty() {
- return mGraph.isEmpty();
- }
-
- @Override
- public boolean contains(Object o) {
- return mGraph.contains(o);
- }
-
- @Override
- public Iterator<Triple> iterator() {
- return mGraph.iterator();
- }
-
- @Override
- public Object[] toArray() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public <T> T[] toArray(T[] a) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean add(Triple e) {
- return mGraph.add(e);
- }
-
- @Override
- public boolean remove(Object o) {
- return mGraph.remove(o);
- }
-
- @Override
- public boolean containsAll(Collection<?> c) {
- return mGraph.containsAll(c);
- }
-
- @Override
- public boolean addAll(Collection<? extends Triple> c) {
- return mGraph.addAll(c);
- }
-
- @Override
- public boolean removeAll(Collection<?> c) {
- return mGraph.removeAll(c);
- }
-
- @Override
- public boolean retainAll(Collection<?> c) {
- return mGraph.retainAll(c);
- }
-
- @Override
- public void clear() {
- mGraph.clear();
- }
-
- @Override
- public void addGraphListener(GraphListener listener, FilterTriple filter, long delay) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void addGraphListener(GraphListener listener, FilterTriple filter) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void removeGraphListener(GraphListener listener) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
- };
- }
- };
-
- typeHandlerSpace.typeHandlerDiscovery = new TypeHandlerDiscovery() {
-
- @Override
- public Object getTypeHandler(Set<UriRef> rdfTypes) {
- if (rdfTypes.contains(myType)){
- return typeHandler;
- }
- return fallbackHandler;
- }
- };
- result.add(typeHandlerSpace);
- result.add(typeHandler);
- result.add(new GraphWriterDummy());
- return result;
- }
- });
- }
-
+ public void dummy() throws IOException {
+ }
+
+//
+// private static LockableMGraph mGraph = new LockableMGraphWrapper(new SimpleMGraph());
+//
+// UriRef myType = new UriRef("org.example/myType");
+//
+// @Path("/myTypeHandler")
+// public static class MyTypeHandler {
+//
+// @GET
+// public String handleGet() {
+// return "handleGet";
+// }
+//
+// @PUT
+// @POST
+// public String handlePut() {
+// return "handlePut";
+// }
+// }
+//
+// @Path("/myTypeHandler2")
+// public static class MyTypeHandler2 {
+//
+// @GET
+// public String handleGet() {
+// return "handleGet2";
+// }
+//
+// @PUT
+// public String handlePut() {
+// return "handlePut2";
+// }
+// }
+//
+// /**
+// * Tests if the correct method of the correct TypeHandler is called,
+// * when using the http-method PUT.
+// */
+// @Test
+// public void testPut() throws IOException {
+//
+// int port = createTestWebServer().getPort();
+//
+// UriRef uri = new UriRef("http://localhost:" + port + "/test");
+// // Setup mGraph
+// Triple triple = new TripleImpl(uri, RDF.type, myType);
+// mGraph.add(triple);
+//
+// URL serverURL = new URL(uri.getUnicodeString());
+// HttpURLConnection connection = (HttpURLConnection) serverURL.openConnection();
+// connection.setDoOutput(true);
+// connection.setRequestMethod("PUT");
+// connection.addRequestProperty("Content-type", "application/x-test");
+// //java sends and invalid *; q=.2 in the default accept-header
+// connection.addRequestProperty("Accept", "*/*; q=.2");
+// OutputStream requestStream = connection.getOutputStream();
+// byte[] putData = {1, 6, 8};
+// requestStream.write(putData);
+// requestStream.flush();
+// //now we actually open the connection
+// connection.connect();
+//
+// InputStream requestInput = connection.getInputStream();
+// ByteArrayOutputStream baos = new ByteArrayOutputStream();
+// for (int ch = requestInput.read(); ch != -1; ch = requestInput.read()) {
+// baos.write(ch);
+// }
+// Assert.assertEquals("handlePut", baos.toString());
+// }
+//
+// /**
+// * Tests if the correct method of the correct TypeHandler is called,
+// * when using the http-method GET.
+// */
+// @Test
+// public void testGet() throws IOException {
+//
+// int port = createTestWebServer().getPort();
+// UriRef uri = new UriRef("http://localhost:" + port + "/test");
+//
+// // Setup mGraph
+// Triple triple = new TripleImpl(uri, RDF.type, myType);
+// mGraph.add(triple);
+//
+// URL serverURL = new URL(uri.getUnicodeString());
+// HttpURLConnection connection = (HttpURLConnection) serverURL.openConnection();
+//
+// connection = (HttpURLConnection) serverURL.openConnection();
+// connection.setRequestMethod("GET");
+//
+// connection.addRequestProperty("Accept", "text/html, */*; q=.2");
+// InputStream requestInput = connection.getInputStream();
+// ByteArrayOutputStream baos = new ByteArrayOutputStream();
+// for (int ch = requestInput.read(); ch != -1; ch = requestInput.read()) {
+// baos.write(ch);
+// }
+// Assert.assertEquals("handleGet", baos.toString());
+// }
+//
+// /**
+// * Tests if the correct description of the resource is returned when
+// * request with "-description" appended to the URL.
+// */
+// @Test
+// public void testGetDescription() throws IOException {
+//
+// int port = createTestWebServer().getPort();
+// UriRef uri = new UriRef("http://localhost:" + port + "/test");
+//
+// // Setup mGraph
+// Triple triple = new TripleImpl(uri, RDF.type, myType);
+// mGraph.add(triple);
+//
+// URL serverURL = new URL(uri.getUnicodeString() + "-description");
+// HttpURLConnection connection = (HttpURLConnection) serverURL.openConnection();
+//
+// connection = (HttpURLConnection) serverURL.openConnection();
+// connection.setRequestMethod("GET");
+//
+// connection.addRequestProperty("Accept", "text/html, */*; q=.2");
+// InputStream requestInput = connection.getInputStream();
+// ByteArrayOutputStream baos = new ByteArrayOutputStream();
+// for (int ch = requestInput.read(); ch != -1; ch = requestInput.read()) {
+// baos.write(ch);
+// }
+// Assert.assertEquals("Graph writer", baos.toString());
+// }
+//
+// private TestWebServer createTestWebServer() {
+// return new TestWebServer(new Application() {
+//
+// @Override
+// public Set<Class<?>> getClasses() {
+// Set<Class<?>> result = new HashSet<Class<?>>();
+// return result;
+// }
+//
+// @Override
+// public Set<Object> getSingletons() {
+// Set<Object> result = new HashSet<Object>();
+// final MyTypeHandler typeHandler = new MyTypeHandler();
+// final MyTypeHandler2 fallbackHandler = new MyTypeHandler2();
+//
+// TypeHandlerSpace typeHandlerSpace = new TypeHandlerSpace();
+// typeHandlerSpace.tcManager = new TcManager(){
+// @Override
+// public LockableMGraph getMGraph(UriRef name) {
+// return new LockableMGraph() {
+//
+// @Override
+// public ReadWriteLock getLock() {
+// return mGraph.getLock();
+// }
+//
+// @Override
+// public Graph getGraph() {
+// return mGraph.getGraph();
+// }
+//
+// @Override
+// public Iterator<Triple> filter(NonLiteral subject, UriRef predicate, Resource object) {
+// return mGraph.filter(subject, predicate, object);
+// }
+//
+// @Override
+// public int size() {
+// return mGraph.size();
+// }
+//
+// @Override
+// public boolean isEmpty() {
+// return mGraph.isEmpty();
+// }
+//
+// @Override
+// public boolean contains(Object o) {
+// return mGraph.contains(o);
+// }
+//
+// @Override
+// public Iterator<Triple> iterator() {
+// return mGraph.iterator();
+// }
+//
+// @Override
+// public Object[] toArray() {
+// throw new UnsupportedOperationException("Not supported yet.");
+// }
+//
+// @Override
+// public <T> T[] toArray(T[] a) {
+// throw new UnsupportedOperationException("Not supported yet.");
+// }
+//
+// @Override
+// public boolean add(Triple e) {
+// return mGraph.add(e);
+// }
+//
+// @Override
+// public boolean remove(Object o) {
+// return mGraph.remove(o);
+// }
+//
+// @Override
+// public boolean containsAll(Collection<?> c) {
+// return mGraph.containsAll(c);
+// }
+//
+// @Override
+// public boolean addAll(Collection<? extends Triple> c) {
+// return mGraph.addAll(c);
+// }
+//
+// @Override
+// public boolean removeAll(Collection<?> c) {
+// return mGraph.removeAll(c);
+// }
+//
+// @Override
+// public boolean retainAll(Collection<?> c) {
+// return mGraph.retainAll(c);
+// }
+//
+// @Override
+// public void clear() {
+// mGraph.clear();
+// }
+//
+// @Override
+// public void addGraphListener(GraphListener listener, FilterTriple filter, long delay) {
+// throw new UnsupportedOperationException("Not supported yet.");
+// }
+//
+// @Override
+// public void addGraphListener(GraphListener listener, FilterTriple filter) {
+// throw new UnsupportedOperationException("Not supported yet.");
+// }
+//
+// @Override
+// public void removeGraphListener(GraphListener listener) {
+// throw new UnsupportedOperationException("Not supported yet.");
+// }
+// };
+// }
+// };
+//
+// typeHandlerSpace.typeHandlerDiscovery = new TypeHandlerDiscovery() {
+//
+// @Override
+// public Object getTypeHandler(Set<UriRef> rdfTypes) {
+// if (rdfTypes.contains(myType)){
+// return typeHandler;
+// }
+// return fallbackHandler;
+// }
+// };
+// result.add(typeHandlerSpace);
+// result.add(typeHandler);
+// result.add(new GraphWriterDummy());
+// return result;
+// }
+// });
+// }
+//
}
Modified: incubator/clerezza/trunk/platform.typepriority/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.typepriority/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.typepriority/pom.xml (original)
+++ incubator/clerezza/trunk/platform.typepriority/pom.xml Wed Nov 28 13:28:12 2012
@@ -71,11 +71,6 @@
<artifactId>jaxrs.rdf.providers</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.testutils</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: incubator/clerezza/trunk/platform.typerendering/platform.typerendering.core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.typerendering/platform.typerendering.core/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.typerendering/platform.typerendering.core/pom.xml (original)
+++ incubator/clerezza/trunk/platform.typerendering/platform.typerendering.core/pom.xml Wed Nov 28 13:28:12 2012
@@ -45,11 +45,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
Modified: incubator/clerezza/trunk/platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java (original)
+++ incubator/clerezza/trunk/platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java Wed Nov 28 13:28:12 2012
@@ -320,7 +320,7 @@ public class UserManagerWeb implements G
}
@POST
- @Consumes("multipart/form")
+ @Consumes("multipart/form-data")
@Path("add-user")
public Response addUser(MultiPartBody form, @Context UriInfo uriInfo) {
AccessController.checkPermission(new UserManagerAccessPermission());
@@ -842,7 +842,7 @@ public class UserManagerWeb implements G
}
@POST
- @Consumes("multipart/form")
+ @Consumes("multipart/form-data")
@Path("update-user")
public Response updateUser(MultiPartBody form, @Context UriInfo uriInfo)
throws UnsupportedEncodingException {
Modified: incubator/clerezza/trunk/platform.usermanager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.usermanager/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.usermanager/pom.xml (original)
+++ incubator/clerezza/trunk/platform.usermanager/pom.xml Wed Nov 28 13:28:12 2012
@@ -67,10 +67,10 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphprovider.content</artifactId>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security</artifactId>
- </dependency>
+ </dependency> -->
</dependencies>
<build>
<plugins>
Modified: incubator/clerezza/trunk/platform.users/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.users/core/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.users/core/pom.xml (original)
+++ incubator/clerezza/trunk/platform.users/core/pom.xml Wed Nov 28 13:28:12 2012
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security</artifactId>
+ <artifactId>platform.config</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@@ -72,10 +72,10 @@
<groupId>org.jsslutils</groupId>
<artifactId>jsslutils</artifactId>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.wymiwyg</groupId>
<artifactId>jetty-osgi-httpservice</artifactId>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/clerezza/trunk/platform.users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala (original)
+++ incubator/clerezza/trunk/platform.users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala Wed Nov 28 13:28:12 2012
@@ -15,7 +15,7 @@
* under the License.
*/
-package org.apache.clerezza.platform.users
+/*package org.apache.clerezza.platform.users
import org.apache.clerezza.platform.security.WebIdBasedPermissionProvider
import org.apache.clerezza.rdf.core.UriRef
@@ -36,3 +36,4 @@ class UserGraphAcessPermissionProvider e
List("(org.apache.clerezza.rdf.core.access.security.TcPermission \""+uriStringWithoutFragment+"\" \"readwrite\")")
}
}
+*/
\ No newline at end of file
Modified: incubator/clerezza/trunk/platform.xhtml2html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.xhtml2html/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.xhtml2html/pom.xml (original)
+++ incubator/clerezza/trunk/platform.xhtml2html/pom.xml Wed Nov 28 13:28:12 2012
@@ -40,6 +40,7 @@
<dependency>
<groupId>org.wymiwyg</groupId>
<artifactId>wrhapi</artifactId>
+ <version>0.9</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: incubator/clerezza/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/pom.xml (original)
+++ incubator/clerezza/trunk/pom.xml Wed Nov 28 13:28:12 2012
@@ -85,7 +85,6 @@
<module>scala-scripting</module>
<module>jaxrs.extensions</module>
<module>jaxrs.rdf.providers</module>
- <module>jaxrs.testutils</module>
<module>jaxrs.utils</module>
<module>maven-jaxrs-report-plugin</module>
<module>maven-ontologies-plugin</module>
@@ -118,11 +117,8 @@
<module>platform.mail</module>
<module>platform.scripting</module>
<module>platform.scripting.scriptmanager</module>
- <module>platform.security.auth.basic</module>
- <module>platform.security.auth.cookie</module>
- <module>platform.security.foafssl</module>
+ <!-- <module>platform.security.foafssl</module> -->
<module>platform.security.conditions</module>
- <module>platform.security</module>
<module>platform.shellcustomizer</module>
<module>platform.typehandlerspace</module>
<module>platform.typerendering</module>
@@ -166,7 +162,6 @@
<module>templating</module>
<module>templating.seedsnipe</module>
<module>tools.offline</module>
- <module>triaxrs</module>
<module>uima</module>
<module>utils.customproperty</module>
<module>utils.imageprocessing</module>
Modified: incubator/clerezza/trunk/rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java (original)
+++ incubator/clerezza/trunk/rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java Wed Nov 28 13:28:12 2012
@@ -18,10 +18,10 @@
*/
package org.apache.clerezza.rdf.core.test;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import java.util.TreeSet;
import org.junit.Test;
import org.apache.clerezza.rdf.core.BNode;
import org.apache.clerezza.rdf.core.Graph;
@@ -310,7 +310,7 @@ public abstract class TcProviderTest {
public void testGraphIsNotMutable() throws Exception {
Triple t1 = createTestTriple();
- Set<Triple> t = new TreeSet<Triple>();
+ Set<Triple> t = new HashSet<Triple>();
t.add(t1);
TcProvider provider = getInstance();
@@ -457,7 +457,7 @@ public abstract class TcProviderTest {
}
private TripleCollection createTestTripleCollection(Triple t) {
- Set<Triple> ts = new TreeSet<Triple>();
+ Set<Triple> ts = new HashSet<Triple>();
ts.add(t);
return new SimpleMGraph(ts);
}
Modified: incubator/clerezza/trunk/rdf.core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/rdf.core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/rdf.core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml (original)
+++ incubator/clerezza/trunk/rdf.core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml Wed Nov 28 13:28:12 2012
@@ -56,9 +56,5 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.seedsnipe</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- </dependency>
</dependencies>
</project>
Modified: incubator/clerezza/trunk/rdf.simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/rdf.simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/rdf.simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java (original)
+++ incubator/clerezza/trunk/rdf.simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java Wed Nov 28 13:28:12 2012
@@ -33,13 +33,12 @@ import org.apache.clerezza.rdf.core.acce
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.clerezza.rdf.core.impl.SimpleGraph;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
-/**
- * @scr.component
- * @scr.service interface="org.apache.clerezza.rdf.core.access.WeightedTcProvider"
- *
- * @author mir
- */
+
+@Component
+@Service(WeightedTcProvider.class)
public class SimpleTcProvider implements WeightedTcProvider {
private Map<UriRef, TripleCollection> tripleMap = new HashMap<UriRef, TripleCollection>();
Modified: incubator/clerezza/trunk/sshshell/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/sshshell/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/sshshell/pom.xml (original)
+++ incubator/clerezza/trunk/sshshell/pom.xml Wed Nov 28 13:28:12 2012
@@ -60,9 +60,10 @@
<artifactId>shell</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security</artifactId>
- </dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.security</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
Modified: incubator/clerezza/trunk/sshshell/src/main/java/org/apache/clerezza/sshshell/SshShell.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/sshshell/src/main/java/org/apache/clerezza/sshshell/SshShell.java?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/sshshell/src/main/java/org/apache/clerezza/sshshell/SshShell.java (original)
+++ incubator/clerezza/trunk/sshshell/src/main/java/org/apache/clerezza/sshshell/SshShell.java Wed Nov 28 13:28:12 2012
@@ -20,19 +20,17 @@ package org.apache.clerezza.sshshell;
*
*/
-
-import java.security.PrivilegedActionException;
-import java.util.logging.Level;
-import org.apache.clerezza.shell.Shell;
-import org.apache.felix.scr.annotations.Reference;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import javax.security.auth.Subject;
+import org.apache.clerezza.shell.Shell;
+import org.apache.clerezza.shell.ShellFactory;
import org.apache.felix.scr.annotations.Component;
-import org.apache.clerezza.platform.security.auth.AuthenticationChecker;
-import org.apache.clerezza.platform.security.UserUtil;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.sshd.*;
import org.apache.sshd.common.Factory;
import org.apache.sshd.server.Command;
@@ -41,10 +39,9 @@ import org.apache.sshd.server.ExitCallba
import org.apache.sshd.server.PasswordAuthenticator;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.apache.sshd.server.session.ServerSession;
+import org.apache.stanbol.commons.security.UserUtil;
+import org.apache.stanbol.commons.security.auth.AuthenticationChecker;
import org.osgi.service.component.ComponentContext;
-import org.apache.clerezza.shell.ShellFactory;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.sshd.server.shell.ProcessShellFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/clerezza/trunk/uima/uima.concept-tagging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.concept-tagging/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/uima/uima.concept-tagging/pom.xml (original)
+++ incubator/clerezza/trunk/uima/uima.concept-tagging/pom.xml Wed Nov 28 13:28:12 2012
@@ -47,10 +47,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>uima.casconsumer</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
<scope>runtime</scope>
Modified: incubator/clerezza/trunk/uima/uima.metadata-generator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.metadata-generator/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/uima/uima.metadata-generator/pom.xml (original)
+++ incubator/clerezza/trunk/uima/uima.metadata-generator/pom.xml Wed Nov 28 13:28:12 2012
@@ -67,11 +67,14 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.testutils</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- testing with last released version, testutils is doscontinued as
+ triaxrs is -->
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>jaxrs.testutils</artifactId>
+ <scope>test</scope>
+ <version>0.9-incubating</version>
+ </dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
Modified: incubator/clerezza/trunk/uima/uima.samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.samples/pom.xml?rev=1414670&r1=1414669&r2=1414670&view=diff
==============================================================================
--- incubator/clerezza/trunk/uima/uima.samples/pom.xml (original)
+++ incubator/clerezza/trunk/uima/uima.samples/pom.xml Wed Nov 28 13:28:12 2012
@@ -38,8 +38,8 @@
<version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>