Author: reto
Date: Wed Nov 14 12:59:25 2012
New Revision: 1409188
URL: http://svn.apache.org/viewvc?rev=1409188&view=rev
Log:
STANBOL-721: added Felix WebConsole plugin for usermanagement, actually
implemented and working is only the possibility to change the password of
admin, no user can be renamed or added
Added:
stanbol/trunk/commons/security/usermanagement/ (with props)
stanbol/trunk/commons/security/usermanagement/README.md
stanbol/trunk/commons/security/usermanagement/pom.xml
stanbol/trunk/commons/security/usermanagement/src/
stanbol/trunk/commons/security/usermanagement/src/main/
stanbol/trunk/commons/security/usermanagement/src/main/java/
stanbol/trunk/commons/security/usermanagement/src/main/java/org/
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/Ontology.java
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/webfragment/
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/webfragment/UserManagementWebFragment.java
stanbol/trunk/commons/security/usermanagement/src/main/resources/
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/test.txt
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/styles/
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/styles/webconsole.css
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/test.txt
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/included.ftl
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editUser.ftl
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/listUser.ftl
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/test.ftl
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/webConsole.ftl
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/rdftypes/
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/rdftypes/Resource.ftl
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/tests/
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/tests/test.ftl
Modified:
stanbol/trunk/commons/httpqueryheaders/ (props changed)
stanbol/trunk/commons/indexedgraph/ (props changed)
stanbol/trunk/commons/jsonld/ (props changed)
stanbol/trunk/commons/launchpad/ (props changed)
stanbol/trunk/commons/ldpath/clerezza/ (props changed)
stanbol/trunk/commons/ldtemplaterenderer/ (props changed)
stanbol/trunk/commons/opennlp/ (props changed)
stanbol/trunk/commons/pom.xml
stanbol/trunk/commons/security/authentication.basic/ (props changed)
stanbol/trunk/commons/security/core/ (props changed)
stanbol/trunk/commons/security/felixwebconsole/ (props changed)
stanbol/trunk/commons/solr/core/ (props changed)
stanbol/trunk/commons/solr/defaults/ (props changed)
stanbol/trunk/commons/solr/install/ (props changed)
stanbol/trunk/commons/solr/managed/ (props changed)
stanbol/trunk/commons/solr/web/ (props changed)
stanbol/trunk/commons/stanboltools/bundledatafileprovider/ (props changed)
stanbol/trunk/commons/web/base/ (props changed)
stanbol/trunk/commons/web/home/ (props changed)
stanbol/trunk/commons/web/ldviewable/ (props changed)
stanbol/trunk/commons/web/sparql/ (props changed)
stanbol/trunk/launchers/bundlelists/authentication/src/main/bundles/list.xml
Propchange: stanbol/trunk/commons/httpqueryheaders/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.settings
.project
Propchange: stanbol/trunk/commons/indexedgraph/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.project
.classpath
Propchange: stanbol/trunk/commons/jsonld/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.project
target
Propchange: stanbol/trunk/commons/launchpad/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.settings
.project
Propchange: stanbol/trunk/commons/ldpath/clerezza/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.settings
.classpath
Propchange: stanbol/trunk/commons/ldtemplaterenderer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.project
.gitignore
.classpath
Propchange: stanbol/trunk/commons/opennlp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.settings
target
Modified: stanbol/trunk/commons/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/pom.xml?rev=1409188&r1=1409187&r2=1409188&view=diff
==============================================================================
--- stanbol/trunk/commons/pom.xml (original)
+++ stanbol/trunk/commons/pom.xml Wed Nov 14 12:59:25 2012
@@ -66,6 +66,7 @@
<module>security/core</module>
<module>security/authentication.basic</module>
<module>security/felixwebconsole</module>
+ <module>security/usermanagement</module>
<module>caslight</module>
<module>testing/jarexec</module>
Propchange: stanbol/trunk/commons/security/authentication.basic/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
target
.classpath
.project
Propchange: stanbol/trunk/commons/security/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.settings
target
.classpath
Propchange: stanbol/trunk/commons/security/felixwebconsole/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
target
.classpath
.project
Propchange: stanbol/trunk/commons/security/usermanagement/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -0,0 +1 @@
+target
Added: stanbol/trunk/commons/security/usermanagement/README.md
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/README.md?rev=1409188&view=auto
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/README.md (added)
+++ stanbol/trunk/commons/security/usermanagement/README.md Wed Nov 14 12:59:25
2012
@@ -0,0 +1,4 @@
+usermanager
+===========
+
+a usermanager for stanbol
\ No newline at end of file
Added: stanbol/trunk/commons/security/usermanagement/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/pom.xml?rev=1409188&view=auto
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/pom.xml (added)
+++ stanbol/trunk/commons/security/usermanagement/pom.xml Wed Nov 14 12:59:25
2012
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>2-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.usermanagement</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Commons usermanagement</name>
+ <description>A Webconsole plugin for user management</description>
+ <scm>
+ <connection>
+
scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/commons/usermanagement
+ </connection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/commons/usermanagement
+ </developerConnection>
+ <url>http://stanbol.apache.org/</url>
+ </scm>
+
+ <build>
+ <!-- make it an OSGi bundle -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.base</artifactId>
+ <version>0.10.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.ontologies</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>3.1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.config</artifactId>
+ <version>0.3-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Jersey, servlet and freemarker -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <!-- OSGi tax -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+
+ <dependency>
+ <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>
+ <type>bundle</type>
+ </dependency>
+ </dependencies>
+
+</project>
Added:
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/Ontology.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/Ontology.java?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/Ontology.java
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/Ontology.java
Wed Nov 14 12:59:25 2012
@@ -0,0 +1,10 @@
+package org.apache.stanbol.commons.usermanagement;
+
+import org.apache.clerezza.rdf.core.UriRef;
+
+public class Ontology {
+
+ public final static UriRef EditableUser =
+ new
UriRef("http://stanbol.apache.org/ontologies/usermanagement#EditableUser";);
+
+}
Added:
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
Wed Nov 14 12:59:25 2012
@@ -0,0 +1,88 @@
+package org.apache.stanbol.commons.usermanagement;
+
+import java.io.IOException;
+import java.net.URL;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.clerezza.rdf.core.serializedform.Serializer;
+import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
+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.stanbol.commons.ldpathtemplate.LdRenderer;
+import org.apache.stanbol.commons.usermanagement.resource.UserResource;
+import org.osgi.framework.BundleContext;
+
+@Component
+@Service(Servlet.class)
+@Properties({
+ @Property(name = "felix.webconsole.label", value =
"usermanagement"),
+ @Property(name = "felix.webconsole.title", value = "User
Management") })
+public class WebConsolePlugin extends
+ org.apache.felix.webconsole.AbstractWebConsolePlugin {
+
+ private static final String STATIC_PREFIX = "/usermanagement/res/";
+
+ @Reference
+ private UserResource userManager;
+
+ @Reference
+ private LdRenderer ldRenderer;
+
+ @Reference
+ private Serializer serializer;
+
+ public static final String NAME = "User Management";
+ public static final String LABEL = "usermanagement";
+
+ public String getLabel() {
+ return LABEL;
+ }
+
+ public String getTitle() {
+ return NAME;
+ }
+
+ protected void renderContent(HttpServletRequest req,
+ HttpServletResponse response) throws ServletException,
IOException {
+
+ //TODO enhance LDPath template to support rdf:Lists and return
list
+ ldRenderer.render(userManager.getUserType(),
+
"html/org/apache/stanbol/commons/usermanagement/webConsole.ftl",
response.getWriter());
+ serializer.serialize(System.out,
userManager.getUserType().getGraph(), SupportedFormat.TURTLE);
+
+ }
+
+ protected String[] getCssReferences() {
+ String[] result = new String[1];
+ //this is to use the stanbol way for static resources
+ //http://felix.apache.org/site/providing-resources.html describes the
webconsole way
+ //TODO make sure things work when stanbol is not in root
+ result[0] = "../../static/user-management/styles/webconsole.css";
+ return result;
+ }
+
+ public void activateBundle(BundleContext bundleContext) {
+ super.activate(bundleContext);
+ }
+
+ public void deactivate() {
+ super.deactivate();
+
+ }
+
+ public URL getResource(String path){
+ if(path.startsWith(STATIC_PREFIX)){
+ return
this.getClass().getResource(path.substring(STATIC_PREFIX.length()));
+
+ }else {
+ return null;
+ }
+ }
+}
\ No newline at end of file
Added:
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
Wed Nov 14 12:59:25 2012
@@ -0,0 +1,209 @@
+package org.apache.stanbol.commons.usermanagement.resource;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.locks.Lock;
+
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.clerezza.platform.config.SystemConfig;
+import org.apache.clerezza.rdf.core.Graph;
+import org.apache.clerezza.rdf.core.Literal;
+import org.apache.clerezza.rdf.core.LiteralFactory;
+import org.apache.clerezza.rdf.core.Triple;
+import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.access.LockableMGraph;
+import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
+import org.apache.clerezza.rdf.core.serializedform.Parser;
+import org.apache.clerezza.rdf.core.serializedform.Serializer;
+import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
+import org.apache.clerezza.rdf.ontologies.FOAF;
+import org.apache.clerezza.rdf.ontologies.PLATFORM;
+import org.apache.clerezza.rdf.ontologies.RDF;
+import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.clerezza.rdf.utils.MGraphUtils;
+import org.apache.clerezza.rdf.utils.MGraphUtils.NoSuchSubGraphException;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.ldviewable.LdViewable;
+import org.apache.clerezza.rdf.ontologies.PERMISSION;
+import org.apache.stanbol.commons.security.PasswordUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Component
+@Service(UserResource.class)
+@Path("user-management")
+public class UserResource {
+
+ private static Logger log = LoggerFactory.getLogger(UserResource.class);
+
+ @Reference(target = SystemConfig.SYSTEM_GRAPH_FILTER)
+ private LockableMGraph systemGraph;
+
+ @Reference
+ private Parser parser;
+
+ @Reference
+ private Serializer serializer;
+
+ @GET
+ public String index() throws UnsupportedEncodingException {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ serializer.serialize(baos, systemGraph, SupportedFormat.TURTLE);
+ String serialized = new String(baos.toByteArray(),"utf-8");
+ return serialized;
+ }
+
+ @GET
+ @Path("users")
+ public LdViewable listUsers(){
+ return new LdViewable("listUser.ftl", getUserType(),
this.getClass());
+ }
+
+ @GET
+ @Path("user/{username}")
+ public LdViewable editUser(@PathParam("username") String userName) {
+ return new LdViewable("editUser.ftl", getUser(userName),
this.getClass());
+ }
+
+ @GET
+ @Path("view-user")
+ public LdViewable viewUser(@QueryParam("userName") String userName) {
+ return new LdViewable("edit.ftl", getUser(userName),
this.getClass());
+ }
+
+ /**
+ * takes edit form data and pushes into store
+ * so far only password change implemented
+ * (others should be straightforward delete/inserts)
+ */
+ @POST
+ @Path("store-user")
+ public Response storeUser(@Context UriInfo uriInfo,
@FormParam("userName") String userName, @FormParam("email") String email,
+ @FormParam("password") String password,
@FormParam("permission[]") List<String> permission) {
+
+ GraphNode userNode = getUser(userName);
+
+ String passwordSha1 = PasswordUtil.convertPassword(password);
+
+ // System.out.println("new password = "+password);
+ // System.out.println("new passwordSha1 = "+passwordSha1);
+
+ System.out.println("BEFORE
========================================================");
+ serializer.serialize(System.out, userNode.getGraph(),
SupportedFormat.TURTLE);
+
+ Iterator<Literal> oldPasswordsSha1 =
userNode.getLiterals(PERMISSION.passwordSha1);
+ Literal oldPasswordSha1 = oldPasswordsSha1.next();
+ // no exception, if there is no value, let it break totally, if more
than one - it is broken elsewhere
+
+ userNode.addPropertyValue(PERMISSION.passwordSha1, passwordSha1);
+ // workaround for possible issue in verification re. PlainLiteral vs.
xsd:string
+ // userNode.addProperty(PERMISSION.passwordSha1, new
PlainLiteralImpl(passwordSha1));
+ // most likely not a problem, and the above will work
+
+ userNode.deleteProperty(PERMISSION.passwordSha1, oldPasswordSha1);
+
+ System.out.println("AFTER
========================================================");
+ serializer.serialize(System.out, userNode.getGraph(),
SupportedFormat.TURTLE);
+
+ URI pageUri =
uriInfo.getBaseUriBuilder().path("/system/console").build();
+
+ // header Cache-control: no-cache, just in case intermediaries are
holding onto old stuff
+ CacheControl cc = new CacheControl();
+ cc.setNoCache(true);
+
+ // see other my not be the best response, but does seem the best given
the jax-rs things available
+ return Response.seeOther(pageUri).cacheControl(cc).build();
+ }
+
+
+
+ /**
+ * replaces the subgraph serialized with RDF/XML in <code>revokedString
+ * </code> with the one from <code>assertedString</code>.
+ *
+ * @param graphUri the graph within which the replacement has to take
place or null
+ * for the content graph
+ * @param assertedString the asserted Graph
+ * @param revokedString the revoked Graph
+ * @param format the media-type of the rdf format in which the asserted
and revoked graph are serialized, default: text/turtle
+ */
+ @POST
+ @Path("replace-subgraph")
+ public void replaceSubGraph(@QueryParam("graph") UriRef graphUri,
+ @FormParam("assert") String assertedString,
+ @FormParam("revoke") String revokedString,
+ @FormParam("format") @DefaultValue("text/turtle")
String format) {
+ final Graph assertedGraph;
+ final Graph revokedGraph;
+ try {
+ assertedGraph = parser.parse(new
ByteArrayInputStream(assertedString.getBytes("utf-8")),
+ format);
+ revokedGraph = parser.parse(new
ByteArrayInputStream(assertedString.getBytes("utf-8")),
+ format);
+ } catch (IOException ex) {
+ log.error("reading graph {}", ex);
+ throw new WebApplicationException(ex, 500);
+ }
+ try {
+ MGraphUtils.removeSubGraph(systemGraph, revokedGraph);
+ } catch (NoSuchSubGraphException ex) {
+ throw new RuntimeException(ex);
+ }
+ systemGraph.addAll(assertedGraph);
+ }
+
+
+ private GraphNode getUser(@QueryParam("userName") String userName) {
+ Iterator<Triple> iter = systemGraph.filter(null,
PLATFORM.userName, new PlainLiteralImpl(userName));
+ if (!iter.hasNext()) {
+ return null;
+ }
+ return new GraphNode(iter.next().getSubject(), systemGraph);
+ }
+
+ public GraphNode getUserType() {
+ return new GraphNode(FOAF.Agent, systemGraph);
+ }
+
+ public Set<GraphNode> getUsers() {
+ return getResourcesOfType(FOAF.Agent);
+ }
+
+ private Set<GraphNode> getResourcesOfType(UriRef type) {
+ Lock readLock = systemGraph.getLock().readLock();
+ readLock.lock();
+ try {
+ final Iterator<Triple> triples =
systemGraph.filter(null, RDF.type, type);
+ Set<GraphNode> userRoles = new HashSet<GraphNode>();
+ while (triples.hasNext()) {
+ userRoles.add(new
GraphNode(triples.next().getSubject(), systemGraph));
+ }
+ return userRoles;
+ } finally {
+ readLock.unlock();
+ }
+ }
+
+}
Added:
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/webfragment/UserManagementWebFragment.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/webfragment/UserManagementWebFragment.java?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/webfragment/UserManagementWebFragment.java
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/webfragment/UserManagementWebFragment.java
Wed Nov 14 12:59:25 2012
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.stanbol.commons.usermanagement.webfragment;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.usermanagement.resource.UserResource;
+import org.apache.stanbol.commons.web.base.LinkResource;
+import org.apache.stanbol.commons.web.base.NavigationLink;
+import org.apache.stanbol.commons.web.base.ScriptResource;
+import org.apache.stanbol.commons.web.base.WebFragment;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.component.ComponentContext;
+
+import freemarker.cache.ClassTemplateLoader;
+import freemarker.cache.TemplateLoader;
+
+/**
+ * Statsically define the list of available resources and providers to be
+ * contributed to the the Stanbol JAX-RS Endpoint.
+ */
+@Component(immediate = true, metatype = true)
+@Service
+public class UserManagementWebFragment implements WebFragment {
+
+ @Reference
+ private UserResource userManager;
+
+ private static final String NAME = "user-management";
+
+ private static final String STATIC_RESOURCE_PATH =
"/org/apache/stanbol/commons/usermanagement/webfragment";
+
+ private BundleContext bundleContext;
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
+ @Activate
+ protected void activate(ComponentContext ctx) {
+ this.bundleContext = ctx.getBundleContext();
+ }
+
+ @Override
+ public Set<Class<?>> getJaxrsResourceClasses() {
+ Set<Class<?>> classes = new HashSet<Class<?>>();
+ return classes;
+ }
+
+ @Override
+ public Set<Object> getJaxrsResourceSingletons() {
+ Set<Object> instances = new HashSet<Object>();
+ instances.add(userManager);
+ return instances;
+ }
+
+ @Override
+ public String getStaticResourceClassPath() {
+ return STATIC_RESOURCE_PATH;
+ }
+
+ @Override
+ public TemplateLoader getTemplateLoader() {
+ return new ClassTemplateLoader(getClass(), "foobar");
+ }
+
+ @Override
+ public List<LinkResource> getLinkResources() {
+ List<LinkResource> resources = new ArrayList<LinkResource>();
+ return resources;
+ }
+
+ @Override
+ public List<ScriptResource> getScriptResources() {
+ List<ScriptResource> resources = new
ArrayList<ScriptResource>();
+ return resources;
+ }
+
+ @Override
+ public List<NavigationLink> getNavigationLinks() {
+ List<NavigationLink> links = new ArrayList<NavigationLink>();
+ return links;
+ }
+
+ @Override
+ public BundleContext getBundleContext() {
+ return bundleContext;
+ }
+
+}
Added:
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/test.txt
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/test.txt?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/test.txt
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/test.txt
Wed Nov 14 12:59:25 2012
@@ -0,0 +1 @@
+hello world!
\ No newline at end of file
Added:
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/styles/webconsole.css
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/styles/webconsole.css?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/styles/webconsole.css
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/styles/webconsole.css
Wed Nov 14 12:59:25 2012
@@ -0,0 +1,5 @@
+li { display: list-item }
+ul {
+ list-style-type: disc;
+ list-style-position: inside;
+ }
Added:
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/test.txt
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/test.txt?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/test.txt
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/resources/org/apache/stanbol/commons/usermanagement/webfragment/test.txt
Wed Nov 14 12:59:25 2012
@@ -0,0 +1 @@
+fooooi oh hkjhkj
\ No newline at end of file
Added:
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/included.ftl
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/included.ftl?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/included.ftl
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/included.ftl
Wed Nov 14 12:59:25 2012
@@ -0,0 +1 @@
+<div>Some included content</div>
\ No newline at end of file
Added:
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editUser.ftl
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editUser.ftl?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editUser.ftl
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editUser.ftl
Wed Nov 14 12:59:25 2012
@@ -0,0 +1,35 @@
+<@namespace platform="http://clerezza.org/2009/08/platform#"; />
+<@namespace permission="http://clerezza.org/2008/10/permission#"; />
+<@namespace sioc="http://rdfs.org/sioc/ns#"; />
+
+<form method="post" action="/user-management/store-user">
+User-Name: <input type="text" name="userName" value="<@ldpath
path="platform:userName :: xsd:string"/>" /><br/>
+<#assign mbox>
+<@ldpath path="foaf:mbox" />
+</#assign>
+<#assign email>
+<#if mbox != "">${mbox?substring(7)}</#if>
+</#assign>
+Email : <input type="text" name="email" value="${email}" /><br/>
+Password : <input type="password" name="password" value="" /><br/>
+ Permissions: <ul>
+ <@ldpath path="fn:sort(permission:hasPermission)">
+ <#assign permission>
+ <@ldpath path="permission:javaPermissionEntry :: xsd:string"/>
+ </#assign>
+ <li class="permission">
+ <input type="text" name="permission[]"
value="${permission?html}" />
+ </li>
+ </@ldpath>
+ </ul>
+ <button name="addPermission">Add permission</button>
+ Groups:
+ <ol>
+ <@ldpath path="fn:sort(sioc:has_function)">
+ <li class="permission">
+ <@ldpath path="dc:title :: xsd:string"/>
+ </li>
+ </@ldpath>
+ </ol>
+ <input type="submit" value="Submit">
+</form>
\ No newline at end of file
Added:
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/listUser.ftl
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/listUser.ftl?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/listUser.ftl
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/listUser.ftl
Wed Nov 14 12:59:25 2012
@@ -0,0 +1,37 @@
+<@namespace platform="http://clerezza.org/2009/08/platform#"; />
+<@namespace permission="http://clerezza.org/2008/10/permission#"; />
+<@namespace sioc="http://rdfs.org/sioc/ns#"; />
+<table id="user-table" class="nicetable noauto">
+
<thead><tr><th>Name</th><th>login</th><th>email</th><th>groups</th><th> </th></tr></thead>
+ <tbody>
+ <@ldpath path="fn:sort(^rdf:type)">
+ <#assign userName>
+ <@ldpath path="platform:userName :: xsd:string"/>
+ </#assign>
+ <tr>
+ <td>get full name here</td>
+ <td>${userName}</td>
+
+ <#assign mbox>
+ <@ldpath path="foaf:mbox" />
+ </#assign>
+ <#assign email>
+ <#if mbox != "">${mbox?substring(7)}</#if>
+ </#assign>
+ <td>${email}</td>
+
+ <td>
+ <@ldpath path="fn:sort(sioc:has_function)">
+ <@ldpath path="dc:title :: xsd:string"/>
+ </@ldpath>
+ </td>
+ <td>
+ <ul class="icons ui-widget">
+ <li class="dynhover ui-state-default ui-corner-all"
title="Edit" onClick="javascript:editUser('${userName}')"><span class="ui-icon
ui-icon-edit"> </span></li>
+ <li class="dynhover ui-state-default ui-corner-all"
title="delete" onClick="javascript:removeUser('${userName}')"><span
class="ui-icon ui-icon-trash"> </span></li>
+ </ul>
+ </td>
+ </tr>
+ </@ldpath>
+ </tbody>
+</table>
\ No newline at end of file
Added:
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/test.ftl
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/test.ftl?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/test.ftl
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/test.ftl
Wed Nov 14 12:59:25 2012
@@ -0,0 +1,23 @@
+<html>
+ <head>
+ <title>Welcome to: <@ldpath path="rdfs:label[@en]"/></title>
+ </head>
+
+ <body>
+ <h1>A properly located template! <@ldpath path="rdfs:label[@en]"/></h1>
+
+ <p>
+ Comment: <@ldpath path="rdfs:comment[@en]"/>
+ </p>
+
+ <ul>
+ <@ldpath path="fn:sort(rdf:type)">
+ <#if evalLDPath("rdfs:label[@en] :: xsd:string")??>
+ <li><@ldpath path="rdfs:label[@en] :: xsd:string"/></li>
+ </#if>
+ </@ldpath>
+ </ul>
+ <#include "/html/included.ftl">
+ </body>
+
+</html>
\ No newline at end of file
Added:
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/webConsole.ftl
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/webConsole.ftl?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/webConsole.ftl
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/webConsole.ftl
Wed Nov 14 12:59:25 2012
@@ -0,0 +1,74 @@
+<@namespace platform="http://clerezza.org/2009/08/platform#"; />
+<@namespace permission="http://clerezza.org/2008/10/permission#"; />
+<@namespace sioc="http://rdfs.org/sioc/ns#"; />
+
+<script>
+$(function() {
+ $("#tabs").tabs();
+ showUserList();
+});
+
+function showUserList(){
+ $.ajax({
+ url: '/user-management/users',
+ success: function(data) {
+ $("div#tabs-users").html(data);
+ $("#user-table").tablesorter();
+ }
+ });
+}
+
+function editUser(name){
+ var back = ("<div style='float:right;'><href='#'
onClick='showUserList()'><< back to user list</a></div>");
+ $.ajax({
+ url: '/user-management/user/'+name,
+ success: function(data) {
+ $("div#tabs-users").html(back);
+ $("div#tabs-users").append(data);
+ }
+ });
+}
+
+function removeUser(name){
+ $.dialog({
+ resizable: false,
+ height:140,
+ modal: true,
+ buttons: {
+ "Delete User": function() {
+ $( this ).dialog( "close" );
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ }
+ });
+}
+
+
+
+</script>
+
+
+<p class="statline ui-state-highlight">There are X amount of users blah blah
blah</p>
+<div id="tabs">
+ <ul>
+ <li><a href="#tabs-users">Users</a></li>
+ <li><a href="#tabs-groups">Groups</a></li>
+ <li><a href="#tabs-permisions">Permissions</a></li>
+ </ul>
+ <div id="tabs-users">loading User List</div>
+ <div id="tabs-groups">groups</div>
+ <div id="tabs-permisions">permissions</div>
+</div>
+
+<!--
+ Permssions:
+ <ul>
+ <@ldpath path="fn:sort(permission:hasPermission)">
+ <li class="permission" style="list-style-type: disc;">
+ <@ldpath path="permission:javaPermissionEntry ::
xsd:string"/>
+ </li>
+ </@ldpath>
+ </ul>
+-->
\ No newline at end of file
Added:
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/rdftypes/Resource.ftl
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/rdftypes/Resource.ftl?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/rdftypes/Resource.ftl
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/rdftypes/Resource.ftl
Wed Nov 14 12:59:25 2012
@@ -0,0 +1 @@
+<@ldpath path="."/>
\ No newline at end of file
Added:
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/tests/test.ftl
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/tests/test.ftl?rev=1409188&view=auto
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/tests/test.ftl
(added)
+++
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/tests/test.ftl
Wed Nov 14 12:59:25 2012
@@ -0,0 +1,23 @@
+<html>
+ <head>
+ <title>Welcome to: <@ldpath path="rdfs:label[@en]"/></title>
+ </head>
+
+ <body>
+ <h1><@ldpath path="rdfs:label[@en]"/></h1>
+
+ <p>
+ Comment: <@ldpath path="rdfs:comment[@en]"/>
+ </p>
+
+ <ul>
+ <@ldpath path="fn:sort(rdf:type)">
+ <#if evalLDPath("rdfs:label[@en] :: xsd:string")??>
+ <li><@ldpath path="rdfs:label[@en] :: xsd:string"/></li>
+ </#if>
+ </@ldpath>
+ </ul>
+ <#include "../included.ftl">
+ </body>
+
+</html>
\ No newline at end of file
Propchange: stanbol/trunk/commons/solr/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.classpath
.project
Propchange: stanbol/trunk/commons/solr/defaults/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.settings
.project
Propchange: stanbol/trunk/commons/solr/install/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.classpath
.settings
Propchange: stanbol/trunk/commons/solr/managed/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.settings
target
Propchange: stanbol/trunk/commons/solr/web/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.project
.classpath
Propchange: stanbol/trunk/commons/stanboltools/bundledatafileprovider/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
target
.settings
Propchange: stanbol/trunk/commons/web/base/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
target
.settings
.classpath
Propchange: stanbol/trunk/commons/web/home/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
target
.project
.classpath
Propchange: stanbol/trunk/commons/web/ldviewable/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
.project
.gitignore
.classpath
Propchange: stanbol/trunk/commons/web/sparql/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 12:59:25 2012
@@ -1,3 +1,4 @@
+bin
target
.project
.classpath
Modified:
stanbol/trunk/launchers/bundlelists/authentication/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/authentication/src/main/bundles/list.xml?rev=1409188&r1=1409187&r2=1409188&view=diff
==============================================================================
---
stanbol/trunk/launchers/bundlelists/authentication/src/main/bundles/list.xml
(original)
+++
stanbol/trunk/launchers/bundlelists/authentication/src/main/bundles/list.xml
Wed Nov 14 12:59:25 2012
@@ -48,5 +48,10 @@
<artifactId>org.apache.stanbol.commons.security.fexilwebconsole</artifactId>
<version>0.10.0-SNAPSHOT</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.usermanagement</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </bundle>
</startLevel>
</bundles>
\ No newline at end of file
