clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r1125666 - in /incubator/clerezza/trunk/parent: ./ platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/ platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala...
Date Sat, 21 May 2011 11:13:52 GMT
Author: reto
Date: Sat May 21 11:13:51 2011
New Revision: 1125666

URL: http://svn.apache.org/viewvc?rev=1125666&view=rev
Log:
CLEREZZA-544: added overloaded render method that take an UriRef rather than a GraphNode.
Moved UserLoginNode out of UserManager to prventUsermNager from depnding on TypeRendering
and thus creating a circle.

Added:
    incubator/clerezza/trunk/parent/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
      - copied, changed from r1125662, incubator/clerezza/trunk/parent/platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java
Removed:
    incubator/clerezza/trunk/parent/platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java
Modified:
    incubator/clerezza/trunk/parent/   (props changed)
    incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
    incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/pom.xml
    incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
    incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
    incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
    incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
    incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderletRendererImpl.java
    incubator/clerezza/trunk/parent/platform.usermanager/pom.xml
    incubator/clerezza/trunk/parent/platform.users/core/src/main/resources/OSGI-INF/serviceComponents.xml
    incubator/clerezza/trunk/parent/scala-scripting/   (props changed)
    incubator/clerezza/trunk/parent/scala-scripting/script-engine/   (props changed)
    incubator/clerezza/trunk/parent/scala-scripting/tests/   (props changed)
    incubator/clerezza/trunk/parent/slf4j-scala-api/   (props changed)
    incubator/clerezza/trunk/parent/uima/uima.casconsumer/   (props changed)

Propchange: incubator/clerezza/trunk/parent/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 21 11:13:51 2011
@@ -1,3 +1,4 @@
+.scala_dependencies
 target
 .pom.xml.swp
 .idea

Copied: incubator/clerezza/trunk/parent/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
(from r1125662, incubator/clerezza/trunk/parent/platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java)
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java?p2=incubator/clerezza/trunk/parent/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java&p1=incubator/clerezza/trunk/parent/platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java&r1=1125662&r2=1125666&rev=1125666&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java
(original)
+++ incubator/clerezza/trunk/parent/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
Sat May 21 11:13:51 2011
@@ -16,25 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.clerezza.platform.usermanager;
+package org.apache.clerezza.platform.dashboard;
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Iterator;
 import org.apache.clerezza.platform.security.UserUtil;
-
-import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
 import org.apache.clerezza.platform.typerendering.UserContextProvider;
+import org.apache.clerezza.platform.usermanager.UserManager;
 import org.apache.clerezza.rdf.core.MGraph;
 import org.apache.clerezza.rdf.core.Triple;
 import org.apache.clerezza.rdf.core.UriRef;
 import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
 import org.apache.clerezza.rdf.ontologies.PERMISSION;
 import org.apache.clerezza.rdf.ontologies.PLATFORM;
+import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Iterator;
 
 /**
  * The login name is added to the user context node. The name is accessable via

Modified: incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala?rev=1125666&r1=1125665&r2=1125666&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
(original)
+++ incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
Sat May 21 11:13:51 2011
@@ -78,10 +78,34 @@ abstract class RenderedPage(arguments: R
 	}
 
 	/**
+	 * renders the specified resource without using the base-graph from resource
+	 * rendered by the caller but getting a new context using the GraphNodeProvider
+	 */
+	def render(resource: UriRef): Seq[Node] = {
+		modeOption match {
+			case Some(m) => render(resource, m)
+			case None => render(resource, "naked")
+		}
+	}
+
+	/**
+	 * renders the specified resource without using the base-graph from resource
+	 * rendered by the caller but getting a new context using the GraphNodeProvider
+	 */
+	def render(resource: UriRef, mode: String) = {
+		def parseNodeSeq(string: String) = {
+			_root_.scala.xml.XML.loadString("<elem>" + string + "</elem>").child
+		}
+		val baos = new java.io.ByteArrayOutputStream
+		renderer.render(resource, context, mode, baos)
+		parseNodeSeq(new String(baos.toByteArray))
+	}
+
+	/**
 	 * This is an object that allows one to use some nice shortcuts in scala based subclasses
 	 * - $variable will get the value of the sharedRenderingValues hash
 	 * - $variable = value allows one to update the sharedRenderingValues hash
-	 * - $? not sure there...
+	 * - $[ClassName] allows to access an osgi service annotated to be a WebRenderingService
 	 */
 	object $ {
 		def apply(key: String) = sharedRenderingValues.get(key)

Modified: incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/pom.xml?rev=1125666&r1=1125665&r2=1125666&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/pom.xml
(original)
+++ incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/pom.xml
Sat May 21 11:13:51 2011
@@ -42,6 +42,10 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.clerezza</groupId>
+			<artifactId>platform.graphnodeprovider</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.clerezza</groupId>
 			<artifactId>platform.typepriority</artifactId>
 		</dependency>
 		<dependency>

Modified: incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java?rev=1125666&r1=1125665&r2=1125666&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
(original)
+++ incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
Sat May 21 11:13:51 2011
@@ -20,6 +20,8 @@ package org.apache.clerezza.platform.typ
 
 import java.io.IOException;
 import java.io.OutputStream;
+
+import org.apache.clerezza.rdf.core.UriRef;
 import org.apache.clerezza.rdf.utils.GraphNode;
 
 /**
@@ -28,11 +30,35 @@ import org.apache.clerezza.rdf.utils.Gra
  * <code>GraphNode</code>s. The media type of the rendered GraphNode is the same
  * as the media type of the output of the calling renderlet.
  *
- * @author mir
+ * @author mir, reto
  */
 public interface CallbackRenderer {
 
+	/**
+	 * Renders the specified resource and context in the specified mode to an outputstream
+	 *
+	 * @param resource
+	 * @param context
+	 * @param mode
+	 * @param os
+	 * @throws IOException
+	 */
 	public void render(GraphNode resource, GraphNode context, String mode, 
-			OutputStream os) throws IOException ;
+			OutputStream os) throws IOException;
+
+	/**
+	 * Renders a specified named resource using the GraphNode returned by
+	 * <code>org.apache.clerezza.platform.graphnodeprovider.GraphNodeProvider#get(org.apache.clerezza.rdf.core.UriRef)</code>.
+	 *
+	 * Otherwise same as render(GraphNode, .GraphNode, String, OutputStream)
+	 *
+	 * @param resource
+	 * @param context
+	 * @param mode
+	 * @param os
+	 * @throws IOException
+	 */
+	public void render(UriRef resource, GraphNode context, String mode,
+			OutputStream os) throws IOException;
 
 }

Modified: incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java?rev=1125666&r1=1125665&r2=1125666&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
(original)
+++ incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
Sat May 21 11:13:51 2011
@@ -20,6 +20,8 @@ package org.apache.clerezza.platform.typ
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -27,27 +29,32 @@ import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriInfo;
+
+import org.apache.clerezza.rdf.core.UriRef;
 import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.clerezza.platform.graphnodeprovider.GraphNodeProvider;
 
 /**
  *
- * @author mir
+ * @author mir, reto
  */
 public class CallbackRendererImpl implements CallbackRenderer {
 	private List<MediaType> mediaTypeList;
-	private RendererFactory manager;
+	private final RendererFactory manager;
+	private final GraphNodeProvider graphNodeProvider;
 	private final UriInfo uriInfo;
 	private final HttpHeaders requestHeaders;
 	private final MultivaluedMap<String, Object> responseHeaders;
 	private final Map<String, Object> sharedRenderingValue;
 
-	CallbackRendererImpl(RendererFactory manager, UriInfo uriInfo,
-			HttpHeaders requestHeaders, MultivaluedMap<String, Object> responseHeaders, MediaType
mediaType, Map<String, Object> sharedRenderingValue) {
+	CallbackRendererImpl(RendererFactory manager, GraphNodeProvider graphNodeProvider, UriInfo
uriInfo,
+						 HttpHeaders requestHeaders, MultivaluedMap<String, Object> responseHeaders,
MediaType mediaType, Map<String, Object> sharedRenderingValue) {
 		this.uriInfo = uriInfo;
 		this.requestHeaders = requestHeaders;
 		this.responseHeaders = responseHeaders;
 		this.mediaTypeList = Collections.singletonList(mediaType);
 		this.manager = manager;
+		this.graphNodeProvider = graphNodeProvider;
 		this.sharedRenderingValue = sharedRenderingValue;
 	}
 	
@@ -63,4 +70,16 @@ public class CallbackRendererImpl implem
 				sharedRenderingValue, os);
 	}
 
+	@Override
+	public void render(final UriRef resource, GraphNode context, String mode,
+			OutputStream os) throws IOException {
+		final GraphNode resourceNode = AccessController.doPrivileged( new PrivilegedAction<GraphNode>()
{
+					@Override
+					public GraphNode run() {
+						return graphNodeProvider.get(resource);
+					}
+				});
+		render(resourceNode, context, mode, os);
+	}
+
 }

Modified: incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java?rev=1125666&r1=1125665&r2=1125666&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
(original)
+++ incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
Sat May 21 11:13:51 2011
@@ -21,6 +21,7 @@ package org.apache.clerezza.platform.typ
 
 import java.util.*;
 import javax.ws.rs.core.MediaType;
+import org.apache.clerezza.platform.graphnodeprovider.GraphNodeProvider;
 import org.apache.clerezza.platform.typepriority.TypePrioritizer;
 import org.apache.clerezza.platform.typerendering.utils.MediaTypeMap;
 import org.apache.clerezza.platform.typerendering.utils.RegexMap;
@@ -65,6 +66,9 @@ public class RendererFactory {
 	@Reference
 	private StartLevel startLevelService;
 
+	@Reference
+	private GraphNodeProvider graphNodeProvider;
+
 	/**
 	 * A Tuple Type-Renderler Startlevel, for identity only the renderlet is relevan
 	 */
@@ -164,7 +168,7 @@ public class RendererFactory {
 							return new TypeRenderletRendererImpl(
 								bestRenderlet,
 								acceptableType,
-								this,
+								this, graphNodeProvider,
 								bundleContext);
 						}
 					}

Modified: incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java?rev=1125666&r1=1125665&r2=1125666&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
(original)
+++ incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
Sat May 21 11:13:51 2011
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.HashMap;
 import java.util.Map;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.HttpHeaders;
@@ -32,6 +31,7 @@ import javax.ws.rs.core.UriInfo;
 import org.apache.clerezza.rdf.core.UriRef;
 import org.apache.clerezza.rdf.utils.GraphNode;
 import org.osgi.framework.BundleContext;
+import org.apache.clerezza.platform.graphnodeprovider.GraphNodeProvider;
 
 /**
  *
@@ -49,11 +49,14 @@ class RenderletRendererImpl implements R
 	private boolean builtIn;
 	private final RendererFactory rendererFactory;
 	private final BundleContext bundleContext;
+	private GraphNodeProvider graphNodeProvider;
 
-	RenderletRendererImpl(UriRef renderingSpecification,
+
+	RenderletRendererImpl(UriRef renderingSpecification, org.apache.clerezza.platform.graphnodeprovider.GraphNodeProvider
graphNodeProvider,
 			Renderlet renderlet, MediaType mediaType, 
 			RendererFactory rendererFactory,
 			BundleContext bundleContext) {
+		this.graphNodeProvider = graphNodeProvider;
 		this.renderlet = renderlet;
 		this.mediaType = mediaType;
 		this.rendererFactory = rendererFactory;
@@ -82,8 +85,8 @@ class RenderletRendererImpl implements R
 			Map<String, Object> sharedRenderingValues,
 			OutputStream entityStream) throws IOException {
 		CallbackRenderer callbackRenderer =
-				new CallbackRendererImpl(rendererFactory,
-				uriInfo, requestHeaders, responseHeaders, mediaType, sharedRenderingValues);
+				new CallbackRendererImpl(rendererFactory, graphNodeProvider,
+						uriInfo, requestHeaders, responseHeaders, mediaType, sharedRenderingValues);
 		renderlet.render(resource, context, sharedRenderingValues, callbackRenderer,
 			renderSpecUri, mode, mediaType,
 			new Renderlet.RequestProperties(uriInfo, requestHeaders,

Modified: incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderletRendererImpl.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderletRendererImpl.java?rev=1125666&r1=1125665&r2=1125666&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderletRendererImpl.java
(original)
+++ incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderletRendererImpl.java
Sat May 21 11:13:51 2011
@@ -20,16 +20,13 @@ package org.apache.clerezza.platform.typ
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
 import java.util.Map;
-import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriInfo;
-import org.apache.clerezza.rdf.core.UriRef;
+
+import org.apache.clerezza.platform.graphnodeprovider.GraphNodeProvider;
 import org.apache.clerezza.rdf.utils.GraphNode;
 import org.osgi.framework.BundleContext;
 
@@ -43,13 +40,15 @@ class TypeRenderletRendererImpl implemen
 	private MediaType mediaType = null;
 	private final RendererFactory rendererFactory;
 	private final BundleContext bundleContext;
+	private final GraphNodeProvider graphNodeProvider;
 
 	TypeRenderletRendererImpl(TypeRenderlet renderlet, MediaType mediaType,
-			RendererFactory rendererFactory,
+			RendererFactory rendererFactory, GraphNodeProvider graphNodeProvider,
 			BundleContext bundleContext) {
 		this.renderlet = renderlet;
 		this.mediaType = mediaType;
 		this.rendererFactory = rendererFactory;
+		this.graphNodeProvider = graphNodeProvider;
 		this.bundleContext = bundleContext;
 	}
 
@@ -71,8 +70,8 @@ class TypeRenderletRendererImpl implemen
 			Map<String, Object> sharedRenderingValues,
 			OutputStream entityStream) throws IOException {
 		CallbackRenderer callbackRenderer =
-				new CallbackRendererImpl(rendererFactory,
-				uriInfo, requestHeaders, responseHeaders, mediaType, sharedRenderingValues);
+				new CallbackRendererImpl(rendererFactory, graphNodeProvider,
+						uriInfo, requestHeaders, responseHeaders, mediaType, sharedRenderingValues);
 		TypeRenderlet.RequestProperties requestProperties =
 				new TypeRenderlet.RequestProperties(uriInfo, requestHeaders,
 				responseHeaders, mode, mediaType, bundleContext);

Modified: incubator/clerezza/trunk/parent/platform.usermanager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.usermanager/pom.xml?rev=1125666&r1=1125665&r2=1125666&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.usermanager/pom.xml (original)
+++ incubator/clerezza/trunk/parent/platform.usermanager/pom.xml Sat May 21 11:13:51 2011
@@ -47,10 +47,6 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.clerezza</groupId>
-			<artifactId>platform.typerendering.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.clerezza</groupId>
 			<artifactId>platform.security</artifactId>
 		</dependency>
 	</dependencies>

Modified: incubator/clerezza/trunk/parent/platform.users/core/src/main/resources/OSGI-INF/serviceComponents.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.users/core/src/main/resources/OSGI-INF/serviceComponents.xml?rev=1125666&r1=1125665&r2=1125666&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.users/core/src/main/resources/OSGI-INF/serviceComponents.xml
(original)
+++ incubator/clerezza/trunk/parent/platform.users/core/src/main/resources/OSGI-INF/serviceComponents.xml
Sat May 21 11:13:51 2011
@@ -13,11 +13,11 @@
 			<provide interface="org.apache.clerezza.platform.users.WebIdGraphsService"/>
 		</service>
 		<reference name="tcManager" interface="org.apache.clerezza.rdf.core.access.TcManager"
-		cardinality="1..1" policy="static" bind="bindTcManager" unbind="unbindTcManager"/>
+				   cardinality="1..1" policy="static" bind="bindTcManager" unbind="unbindTcManager"/>
 		<reference name="platformConfig" interface="org.apache.clerezza.platform.config.PlatformConfig"
-		cardinality="1..1" policy="static" bind="bindPlatformConfig" unbind="unbindPlatformConfig"/>
+				   cardinality="1..1" policy="static" bind="bindPlatformConfig" unbind="unbindPlatformConfig"/>
 		<reference name="proxy" interface="org.apache.clerezza.rdf.storage.web.WebProxy"
-        cardinality="1..1" policy="static" bind="bindProxy" unbind="unbindProxy"/>
+				   cardinality="1..1" policy="static" bind="bindProxy" unbind="unbindProxy"/>
 		<!-- <reference name="tcManager" interface="org.apache.clerezza.platform.users.WebDescriptionProvider"
 		cardinality="1..1" policy="static" bind="bindWebDescriptionProvider" unbind="unbindWebDescriptionProvider"/>
-->
 	</scr:component>

Propchange: incubator/clerezza/trunk/parent/scala-scripting/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 21 11:13:51 2011
@@ -1,2 +1,3 @@
+scala.iml
 target
 .pom.xml.swp

Propchange: incubator/clerezza/trunk/parent/scala-scripting/script-engine/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 21 11:13:51 2011
@@ -1,3 +1,4 @@
+script-engine.iml
 target
 .classpath
 .project

Propchange: incubator/clerezza/trunk/parent/scala-scripting/tests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 21 11:13:51 2011
@@ -1,3 +1,4 @@
+tests.iml
 target
 .project
 .classpath

Propchange: incubator/clerezza/trunk/parent/slf4j-scala-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 21 11:13:51 2011
@@ -1,2 +1,3 @@
+slf4j-scala-api.iml
 target
 .scala_dependencies

Propchange: incubator/clerezza/trunk/parent/uima/uima.casconsumer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 21 11:13:51 2011
@@ -1 +1,2 @@
+target
 *.iml



Mime
View raw message