From: Mathieu Baudier Date: Fri, 9 Jan 2015 16:03:44 +0000 (+0000) Subject: Move to legacy X-Git-Tag: argeo-commons-2.1.30~458 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=b51d4215cb90b66e3eaf39b00437075e4742acd6;p=lgpl%2Fargeo-commons.git Move to legacy git-svn-id: https://svn.argeo.org/commons/trunk@7654 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.ext.jdbm/.project b/org.argeo.ext.jdbm/.project deleted file mode 100644 index b1d7029b9..000000000 --- a/org.argeo.ext.jdbm/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.ext.jdbm - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.ext.jdbm/bnd.bnd b/org.argeo.ext.jdbm/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/org.argeo.ext.jdbm/build.properties b/org.argeo.ext.jdbm/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/org.argeo.ext.jdbm/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/org.argeo.ext.jdbm/pom.xml b/org.argeo.ext.jdbm/pom.xml deleted file mode 100644 index 4c1c02f33..000000000 --- a/org.argeo.ext.jdbm/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - 4.0.0 - - org.argeo.commons - 2.1.12-SNAPSHOT - argeo-commons - .. - - org.argeo.ext.jdbm - Commons Server JDBM Extension - Add Apache Directory Server support to JDBM - - - - org.apache.felix - maven-bundle-plugin - - - jdbm - - org.apache.directory.server.core.partition.impl.btree.jdbm;resolution:=optional, - org.apache.directory.server.core.schema;resolution:=optional, - org.apache.directory.server.core.partition.impl;resolution:=optional, - org.apache.directory.server.core.partition.impl.btree;resolution:=optional, - org.apache.directory.shared.ldap.message;resolution:=optional, - - - - - - - \ No newline at end of file diff --git a/org.argeo.jackrabbit.webapp/.project b/org.argeo.jackrabbit.webapp/.project deleted file mode 100644 index 37eed0584..000000000 --- a/org.argeo.jackrabbit.webapp/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.jackrabbit.webapp - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs b/org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index ee0c8b2c0..000000000 --- a/org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Feb 22 17:15:24 CET 2011 -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml b/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml deleted file mode 100644 index 723e6c70f..000000000 --- a/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - osgibundle:jackrabbit-webapp.properties - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml b/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml deleted file mode 100644 index 089c71559..000000000 --- a/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml b/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml deleted file mode 100644 index f5cd4d609..000000000 --- a/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml b/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml deleted file mode 100644 index 52238a7de..000000000 --- a/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PATTERN_TYPE_APACHE_ANT - /**=ROLE_USER,ROLE_ADMIN - - - - - - - PATTERN_TYPE_APACHE_ANT - /**=IS_AUTHENTICATED_ANONYMOUSLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${argeo.server.realmName} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.jackrabbit.webapp/WEB-INF/web.xml b/org.argeo.jackrabbit.webapp/WEB-INF/web.xml deleted file mode 100644 index a1876b306..000000000 --- a/org.argeo.jackrabbit.webapp/WEB-INF/web.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - Argeo Jackrabbit Webapp - - - - 5 - - - - - contextConfigLocation - /WEB-INF/applicationContext.xml - - - - Spring Context - org.springframework.web.context.ContextLoaderListener - - - contextClass - org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext - - - - - remoting - org.argeo.jackrabbit.remote.ExtendedDispatcherServlet - - contextClass - org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext - - - dispatchOptionsRequest - true - - 1 - - - - remoting - /jcr/* - - - - remoting - /pub/* - - - - - webdav - org.argeo.jackrabbit.remote.ExtendedDispatcherServlet - - contextClass - org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext - - - dispatchOptionsRequest - true - - 1 - - - - webdav - /files/* - - - - webdav - /public/* - - - - - filterChain.davex - org.springframework.web.filter.DelegatingFilterProxy - - - filterChain.davex - /jcr/* - - - - filterChain.private - org.springframework.web.filter.DelegatingFilterProxy - - - filterChain.private - /files/* - - - - filterChain.public - org.springframework.web.filter.DelegatingFilterProxy - - - filterChain.public - /pub/* - - - filterChain.public - /public/* - - - diff --git a/org.argeo.jackrabbit.webapp/WEB-INF/webdav-config.xml b/org.argeo.jackrabbit.webapp/WEB-INF/webdav-config.xml deleted file mode 100644 index da4e18b11..000000000 --- a/org.argeo.jackrabbit.webapp/WEB-INF/webdav-config.xml +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - nt:file - nt:resource - - - - - - - - - - - - - rep - jcr - - - - - - - diff --git a/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml b/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml deleted file mode 100644 index 561d20c03..000000000 --- a/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.jackrabbit.webapp/bnd.bnd b/org.argeo.jackrabbit.webapp/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/org.argeo.jackrabbit.webapp/build.properties b/org.argeo.jackrabbit.webapp/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/org.argeo.jackrabbit.webapp/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/org.argeo.jackrabbit.webapp/jackrabbit-webapp.properties b/org.argeo.jackrabbit.webapp/jackrabbit-webapp.properties deleted file mode 100644 index 47f47b93b..000000000 --- a/org.argeo.jackrabbit.webapp/jackrabbit-webapp.properties +++ /dev/null @@ -1,3 +0,0 @@ -argeo.security.systemKey=argeo -argeo.server.realmName=Argeo -argeo.jcr.webapp.rememberMeValidity=3600 \ No newline at end of file diff --git a/org.argeo.jackrabbit.webapp/pom.xml b/org.argeo.jackrabbit.webapp/pom.xml deleted file mode 100644 index 38db5a180..000000000 --- a/org.argeo.jackrabbit.webapp/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - 4.0.0 - - org.argeo.commons - 2.1.12-SNAPSHOT - argeo-commons - .. - - org.argeo.jackrabbit.webapp - Commons Server Jackrabbit Webapp - JCR remoting, WebDav - - - - org.apache.felix - maven-bundle-plugin - - - data - - - *, - javax.jcr, - javax.servlet, - javax.servlet.http, - javax.servlet.resources, - org.aopalliance.aop, - org.argeo.jackrabbit.remote, - org.argeo.jcr, - org.argeo.jcr.mvc, - org.springframework.aop, - org.springframework.aop.framework, - org.springframework.aop.scope, - org.springframework.beans.factory.config, - org.springframework.osgi.web.context.support, - org.springframework.security, - org.springframework.security.providers.anonymous, - org.springframework.security.ui, - org.springframework.security.ui.webapp, - org.springframework.security.ui.preauth.x509, - org.springframework.security.userdetails, - org.springframework.web.context, - org.springframework.web.filter, - org.springframework.web.servlet, - org.springframework.web.servlet.handler, - org.springframework.web.servlet.view, - org.springframework.security.util, - org.springframework.security.context, - org.springframework.security.ui.basicauth, - org.springframework.security.intercept.web, - org.springframework.security.vote, - org.springframework.security.ui.logout, - org.apache.jackrabbit.server, - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.mvc/.classpath b/org.argeo.security.mvc/.classpath deleted file mode 100644 index d2953a684..000000000 --- a/org.argeo.security.mvc/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/org.argeo.security.mvc/.project b/org.argeo.security.mvc/.project deleted file mode 100644 index b287d0835..000000000 --- a/org.argeo.security.mvc/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.security.mvc - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.security.mvc/.settings/org.eclipse.jdt.core.prefs b/org.argeo.security.mvc/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index d2110d0b1..000000000 --- a/org.argeo.security.mvc/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Tue Sep 15 11:35:07 CEST 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/org.argeo.security.mvc/.settings/org.maven.ide.eclipse.prefs b/org.argeo.security.mvc/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 2169c4308..000000000 --- a/org.argeo.security.mvc/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Tue Sep 15 11:35:01 CEST 2009 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/org.argeo.security.mvc/bnd.bnd b/org.argeo.security.mvc/bnd.bnd deleted file mode 100644 index 630bdd797..000000000 --- a/org.argeo.security.mvc/bnd.bnd +++ /dev/null @@ -1 +0,0 @@ -Import-Package: javax.servlet,* diff --git a/org.argeo.security.mvc/build.properties b/org.argeo.security.mvc/build.properties deleted file mode 100644 index 1414da572..000000000 --- a/org.argeo.security.mvc/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -additional.bundles = org.springframework.beans -source.. = src/ diff --git a/org.argeo.security.mvc/pom.xml b/org.argeo.security.mvc/pom.xml deleted file mode 100644 index 26c2f9ea0..000000000 --- a/org.argeo.security.mvc/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - - org.argeo.commons - argeo-commons - 2.1.12-SNAPSHOT - .. - - org.argeo.security.mvc - Commons Security MVC - - - - org.argeo.commons - org.argeo.server.core - 2.1.12-SNAPSHOT - - - - - org.argeo.commons - org.argeo.security.core - 2.1.12-SNAPSHOT - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoRememberMeServices.java b/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoRememberMeServices.java deleted file mode 100644 index bf73e073b..000000000 --- a/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoRememberMeServices.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2007-2012 Mathieu Baudier - * - * Licensed 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.argeo.security.mvc; - -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices; - -public class ArgeoRememberMeServices extends TokenBasedRememberMeServices { - public final static String DEFAULT_COOKIE_NAME = "ARGEO_SECURITY"; - - public ArgeoRememberMeServices() { - setCookieName(DEFAULT_COOKIE_NAME); - } - - /** - * Sets a "cancel cookie" (with maxAge = 0) on the response to disable - * persistent logins. - * - * @param request - * @param response - */ - protected void cancelCookie(HttpServletRequest request, - HttpServletResponse response) { - Cookie cookie = new Cookie(getCookieName(), null); - cookie.setMaxAge(0); - cookie.setPath("/"); - - response.addCookie(cookie); - } - - /** - * Sets the cookie on the response - * - * @param tokens - * the tokens which will be encoded to make the cookie value. - * @param maxAge - * the value passed to {@link Cookie#setMaxAge(int)} - * @param request - * the request - * @param response - * the response to add the cookie to. - */ - protected void setCookie(String[] tokens, int maxAge, - HttpServletRequest request, HttpServletResponse response) { - String cookieValue = encodeCookie(tokens); - Cookie cookie = new Cookie(getCookieName(), cookieValue); - cookie.setMaxAge(maxAge); - cookie.setPath("/"); - response.addCookie(cookie); - } - -} diff --git a/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoUserInterceptor.java b/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoUserInterceptor.java deleted file mode 100644 index fd83e9f73..000000000 --- a/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoUserInterceptor.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2007-2012 Mathieu Baudier - * - * Licensed 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.argeo.security.mvc; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.argeo.security.UserAdminService; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; - -/** Add the current argeo user as an attribute to the request. */ -public class ArgeoUserInterceptor extends HandlerInterceptorAdapter { - private UserAdminService securityService; - - @Override - public boolean preHandle(HttpServletRequest request, - HttpServletResponse response, Object handler) throws Exception { - //request.setAttribute("argeoUser", securityService.getCurrentUser()); - return super.preHandle(request, response, handler); - } - - public void setSecurityService(UserAdminService securityService) { - this.securityService = securityService; - } - -} diff --git a/org.argeo.security.mvc/src/org/argeo/security/mvc/UsersRolesController.java b/org.argeo.security.mvc/src/org/argeo/security/mvc/UsersRolesController.java deleted file mode 100644 index 185d376a6..000000000 --- a/org.argeo.security.mvc/src/org/argeo/security/mvc/UsersRolesController.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) 2007-2012 Mathieu Baudier - * - * Licensed 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.argeo.security.mvc; - -import org.argeo.server.mvc.MvcConstants; -import org.springframework.stereotype.Controller; - -@Controller -public class UsersRolesController implements MvcConstants { -// private ArgeoSecurityService securityService; -// private Deserializer userDeserializer = null; - - /* USER */ - -// @RequestMapping("/getCredentials.*") -// @ModelAttribute("user") -// public ArgeoUser getCredentials() { -// ArgeoUser argeoUser = securityService.getCurrentUser(); -// if (argeoUser == null) -// return new SimpleArgeoUser(); -// else -// return argeoUser; -// } -// -// @RequestMapping("/getUsersList.*") -// @ModelAttribute("users") -// public Set getUsersList() { -// return securityService.listUsers(); -// } -// -// @RequestMapping("/userExists.*") -// public BooleanAnswer userExists(@RequestParam("username") String username) { -// return new BooleanAnswer(securityService.userExists(username)); -// } -// -// @RequestMapping("/createUser.*") -// @ModelAttribute("user") -// public ArgeoUser createUser(Reader reader) { -// ArgeoUser user = userDeserializer.deserialize(reader, -// SimpleArgeoUser.class); -// securityService.newUser(user); -// return securityService.getUser(user.getUsername()); -// } -// -// @RequestMapping("/updateUser.*") -// @ModelAttribute("user") -// public ArgeoUser updateUser(Reader reader) { -// ArgeoUser user = userDeserializer.deserialize(reader, -// SimpleArgeoUser.class); -// securityService.updateUser(user); -// return securityService.getUser(user.getUsername()); -// } -// -// @RequestMapping("/updateUserSelf.*") -// @ModelAttribute("user") -// /** Will only update the user natures.*/ -// public ArgeoUser updateUserSelf(Reader reader) { -// ArgeoUser user = securityService.getCurrentUser(); -// ArgeoUser userForNatures = userDeserializer.deserialize(reader, -// SimpleArgeoUser.class); -// user.updateUserNatures(userForNatures.getUserNatures()); -// securityService.updateUser(user); -// return securityService.getUser(user.getUsername()); -// } -// -// @RequestMapping("/deleteUser.*") -// public ServerAnswer deleteUser(@RequestParam("username") String username) { -// securityService.deleteUser(username); -// return ServerAnswer.ok("User " + username + " deleted"); -// } -// -// @RequestMapping("/getUserDetails.*") -// @ModelAttribute("user") -// public ArgeoUser getUserDetails(@RequestParam("username") String username) { -// return securityService.getUser(username); -// } - - /* ROLE */ -// @RequestMapping("/getRolesList.*") -// @ModelAttribute("roles") -// public Set getEditableRolesList() { -// return securityService.listEditableRoles(); -// } -// -// @RequestMapping("/createRole.*") -// public ServerAnswer createRole(@RequestParam("role") String role) { -// securityService.newRole(role); -// return ServerAnswer.ok("Role " + role + " created"); -// } -// -// @RequestMapping("/deleteRole.*") -// public ServerAnswer deleteRole(@RequestParam("role") String role) { -// securityService.deleteRole(role); -// return ServerAnswer.ok("Role " + role + " deleted"); -// } -// -// @RequestMapping("/updateUserPassword.*") -// public ServerAnswer updateUserPassword( -// @RequestParam("username") String username, -// @RequestParam("password") String password) { -// securityService.updateUserPassword(username, password); -// return ServerAnswer.ok("Password updated for user " + username); -// } -// -// @RequestMapping("/updatePassword.*") -// public ServerAnswer updatePassword( -// @RequestParam("oldPassword") String oldPassword, -// @RequestParam("password") String password) { -// securityService.updateCurrentUserPassword(oldPassword, password); -// return ServerAnswer.ok("Password updated"); -// } -// -// public void setUserDeserializer(Deserializer userDeserializer) { -// this.userDeserializer = userDeserializer; -// } -// -// public void setSecurityService(ArgeoSecurityService securityService) { -// this.securityService = securityService; -// } - -} diff --git a/org.argeo.server.ads.server/.project b/org.argeo.server.ads.server/.project deleted file mode 100644 index a191480d8..000000000 --- a/org.argeo.server.ads.server/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.server.ads.server - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.server.ads.server/.settings/org.eclipse.pde.core.prefs b/org.argeo.server.ads.server/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 5733b3123..000000000 --- a/org.argeo.server.ads.server/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Sun Jan 16 09:58:38 CET 2011 -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/org.argeo.server.ads.server/META-INF/spring/ads.xml b/org.argeo.server.ads.server/META-INF/spring/ads.xml deleted file mode 100644 index 6fdf476cc..000000000 --- a/org.argeo.server.ads.server/META-INF/spring/ads.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - osgibundle:ads.properties - - - - - - - - - - - ${argeo.ads.init.ldif} - - - - - - - - simple - ${argeo.ldap.manager.userdn} - ${argeo.ldap.manager.password} - - - - - - - - - - - - diff --git a/org.argeo.server.ads.server/META-INF/spring/server.xml b/org.argeo.server.ads.server/META-INF/spring/server.xml deleted file mode 100644 index 84407be13..000000000 --- a/org.argeo.server.ads.server/META-INF/spring/server.xml +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.server.ads.server/ads.properties b/org.argeo.server.ads.server/ads.properties deleted file mode 100644 index 4aa138d97..000000000 --- a/org.argeo.server.ads.server/ads.properties +++ /dev/null @@ -1,5 +0,0 @@ -argeo.ldap.rootdn=dc=demo,dc=example,dc=org -argeo.ldap.port=10389 -argeo.ldap.manager.userdn=uid=admin,ou=system -argeo.ldap.manager.password=secret -argeo.ads.init.ldif=osgibundle:init.ldif \ No newline at end of file diff --git a/org.argeo.server.ads.server/bnd.bnd b/org.argeo.server.ads.server/bnd.bnd deleted file mode 100644 index 71b51a334..000000000 --- a/org.argeo.server.ads.server/bnd.bnd +++ /dev/null @@ -1,23 +0,0 @@ -Spring-Context: META-INF/spring/*.xml;create-asynchronously:=false -Import-Package: javax.naming.directory,\ -jdbm,\ -org.apache.directory.server.configuration,\ -org.apache.directory.server.core.authn,\ -org.apache.directory.server.core.authz,\ -org.apache.directory.server.core.collective,\ -org.apache.directory.server.core.configuration,\ -org.apache.directory.server.core.event,\ -org.apache.directory.server.core.exception,\ -org.apache.directory.server.core.normalization,\ -org.apache.directory.server.core.operational,\ -org.apache.directory.server.core.partition.impl.btree,\ -org.apache.directory.server.core.referral,\ -org.apache.directory.server.core.schema,\ -org.apache.directory.server.core.schema.bootstrap,\ -org.apache.directory.server.core.subtree,\ -org.apache.directory.server.jndi,\ -org.apache.directory.server.ldap.support.extended,\ -org.apache.directory.shared.asn1.codec,\ -org.argeo.server.ads,\ -org.springframework.beans.factory.config,\ -* \ No newline at end of file diff --git a/org.argeo.server.ads.server/build.properties b/org.argeo.server.ads.server/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/org.argeo.server.ads.server/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/org.argeo.server.ads.server/init.ldif b/org.argeo.server.ads.server/init.ldif deleted file mode 100644 index 0d2e8ba8f..000000000 --- a/org.argeo.server.ads.server/init.ldif +++ /dev/null @@ -1,47 +0,0 @@ -dn: dc=demo,dc=example,dc=org -objectClass: domain -objectClass: extensibleObject -objectClass: top -dc: demo - -dn: ou=Roles,dc=demo,dc=example,dc=org -objectClass: organizationalUnit -objectClass: top -ou: Roles - -dn: ou=People,dc=demo,dc=example,dc=org -objectClass: organizationalUnit -objectClass: top -ou: People - -dn: uid=demo,ou=People,dc=demo,dc=example,dc=org -objectClass: organizationalPerson -objectClass: person -objectClass: inetOrgPerson -objectClass: top -cn: demo User -description: Demo user -givenname: Demo -mail: demo@localhost -sn: User -uid: demo -userpassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 - -dn: uid=root,ou=People,dc=demo,dc=example,dc=org -objectClass: person -objectClass: inetOrgPerson -objectClass: organizationalPerson -objectClass: top -cn: demo User -description: Superuser -givenname: Root -mail: root@localhost -sn: Root -uid: root -userpassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 - -dn: cn=admin,ou=Roles,dc=demo,dc=example,dc=org -objectClass: groupOfNames -objectClass: top -cn: admin -member: uid=root,ou=People,dc=demo,dc=example,dc=org diff --git a/org.argeo.server.ads.server/pom.xml b/org.argeo.server.ads.server/pom.xml deleted file mode 100644 index 3f491595a..000000000 --- a/org.argeo.server.ads.server/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - - org.argeo.commons - 2.1.12-SNAPSHOT - argeo-commons - .. - - org.argeo.server.ads.server - Commons Server Default ADS LDAP Server - \ No newline at end of file diff --git a/org.argeo.server.ads/.classpath b/org.argeo.server.ads/.classpath deleted file mode 100644 index d2953a684..000000000 --- a/org.argeo.server.ads/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/org.argeo.server.ads/.project b/org.argeo.server.ads/.project deleted file mode 100644 index 448ef0483..000000000 --- a/org.argeo.server.ads/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.server.ads - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.server.ads/bnd.bnd b/org.argeo.server.ads/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/org.argeo.server.ads/build.properties b/org.argeo.server.ads/build.properties deleted file mode 100644 index 6e3ef5450..000000000 --- a/org.argeo.server.ads/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -additional.bundles = org.apache.directory.server.core -source.. = src/ diff --git a/org.argeo.server.ads/pom.xml b/org.argeo.server.ads/pom.xml deleted file mode 100644 index d2a3e7391..000000000 --- a/org.argeo.server.ads/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - 4.0.0 - - org.argeo.commons - argeo-commons - 2.1.12-SNAPSHOT - .. - - org.argeo.server.ads - Commons Server Apache Directory Server - - - org.argeo.commons - org.argeo.util - 2.1.12-SNAPSHOT - - - - - org.argeo.tp - org.apache.directory.server.jndi - - - - org.slf4j - com.springsource.slf4j.api - - - - - - - org.argeo.tp - org.apache.commons.io - - - - - org.argeo.tp - org.springframework.core - - - org.argeo.tp - org.springframework.beans - - - - - org.argeo.tp - slf4j.org.apache.commons.logging - - - org.argeo.tp - slf4j.api - - - \ No newline at end of file diff --git a/org.argeo.server.ads/src/org/argeo/server/ads/AdsContainer.java b/org.argeo.server.ads/src/org/argeo/server/ads/AdsContainer.java deleted file mode 100644 index e95cd8f5a..000000000 --- a/org.argeo.server.ads/src/org/argeo/server/ads/AdsContainer.java +++ /dev/null @@ -1,243 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed 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.argeo.server.ads; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Writer; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.naming.directory.InitialDirContext; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.directory.server.configuration.MutableServerStartupConfiguration; -import org.apache.directory.server.core.configuration.ShutdownConfiguration; -import org.apache.directory.server.jndi.ServerContextFactory; -import org.argeo.ArgeoException; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.core.io.Resource; -import org.springframework.util.Assert; - -/** Wraps an Apache Directory Server instance. */ -@SuppressWarnings("restriction") -public class AdsContainer implements InitializingBean, DisposableBean { - private final static Log log = LogFactory.getLog(AdsContainer.class); - - private MutableServerStartupConfiguration configuration; - private Properties environment = null; - private File workingDirectory = new File( - System.getProperty("java.io.tmpdir") + File.separator - + "argeo-apacheDirectoryServer"); - private Boolean deleteWorkingDirOnExit = false; - - // LDIF - private List ldifs = new ArrayList(); - private List ignoredLdifAttributes = new ArrayList(); - /** default is 'demo' */ - private String ldifPassword = "e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9"; - private String ldifPasswordAttribute = "userPassword"; - private File ldifDirectory; - - @SuppressWarnings("unchecked") - public void afterPropertiesSet() throws Exception { - - log.info("Starting directory server with id '" - + configuration.getInstanceId() + "' in directory " - + workingDirectory.getAbsolutePath()); - - if (deleteWorkingDirOnExit && workingDirectory.exists()) { - log.warn("Found existing directory " + workingDirectory - + " deleting it..."); - FileUtils.deleteDirectory(workingDirectory); - } - configuration.setWorkingDirectory(workingDirectory); - workingDirectory.mkdirs(); - - if (ldifDirectory != null) - configuration.setLdifDirectory(ldifDirectory); - else - configuration.setLdifDirectory(new File(workingDirectory - .getAbsolutePath() + File.separator + "ldif")); - - if (ignoredLdifAttributes.size() == 0) { - ignoredLdifAttributes.add("entryUUID"); - ignoredLdifAttributes.add("structuralObjectClass"); - ignoredLdifAttributes.add("creatorsName"); - ignoredLdifAttributes.add("createTimestamp"); - ignoredLdifAttributes.add("entryCSN"); - ignoredLdifAttributes.add("modifiersName"); - ignoredLdifAttributes.add("modifyTimestamp"); - } - - // Process provided LDIF files - if (ldifs.size() > 0) - configuration.getLdifDirectory().mkdirs(); - for (Resource ldif : ldifs) { - File targetFile = new File(configuration.getLdifDirectory() - .getAbsolutePath() - + File.separator - + ldif.getFilename().replace(':', '_')); - processLdif(ldif, targetFile); - } - - Properties env = new Properties(); - env.setProperty(Context.INITIAL_CONTEXT_FACTORY, - ServerContextFactory.class.getName()); - Assert.notNull(environment); - env.putAll(environment); - env.putAll(configuration.toJndiEnvironment()); - - try { - new InitialDirContext(env); - } catch (NamingException e) { - throw new ArgeoException("Failed to start Apache Directory server", - e); - } - } - - /** - * Processes an LDIF resource, filtering out attributes that cannot be - * imported in ADS and forcing a password. - */ - protected void processLdif(Resource ldif, File targetFile) { - BufferedReader reader = null; - Writer writer = null; - try { - reader = new BufferedReader(new InputStreamReader( - ldif.getInputStream())); - writer = new FileWriter(targetFile); - String line = null; - lines: while ((line = reader.readLine()) != null) { - // comment and empty lines - if (line.trim().equals("") || line.startsWith("#")) { - writer.write(line); - writer.write('\n'); - continue lines; - } - - String[] tokens = line.split(":"); - String attribute = null; - if (tokens != null && tokens.length > 1) { - attribute = tokens[0].trim(); - if (ignoredLdifAttributes.contains(attribute)) - continue lines;// ignore - - if (attribute.equals("bdb_db_open")) { - log.warn("Ignored OpenLDAP output\n" + line); - continue lines; - } - - if (ldifPassword != null - && attribute.equals(ldifPasswordAttribute)) { - line = ldifPasswordAttribute + ":: " + ldifPassword; - } - - writer.write(line); - writer.write('\n'); - } else { - log.warn("Ignored LDIF line\n" + line); - } - } - if (log.isDebugEnabled()) - log.debug("Processed " + ldif + " to LDIF directory " - + configuration.getLdifDirectory()); - } catch (IOException e) { - throw new ArgeoException("Cannot process LDIF " + ldif, e); - } finally { - IOUtils.closeQuietly(reader); - IOUtils.closeQuietly(writer); - } - } - - @SuppressWarnings("unchecked") - public void destroy() throws Exception { - ShutdownConfiguration shutdown = new ShutdownConfiguration( - configuration.getInstanceId()); - - Properties env = new Properties(); - env.setProperty(Context.INITIAL_CONTEXT_FACTORY, - ServerContextFactory.class.getName()); - Assert.notNull(environment); - env.putAll(environment); - env.putAll(shutdown.toJndiEnvironment()); - - log.info("Shutting down directory server with id '" - + configuration.getInstanceId() + "'"); - - try { - new InitialContext(env); - } catch (NamingException e) { - throw new ArgeoException("Failed to stop Apache Directory server", - e); - } - - if (workingDirectory.exists() && deleteWorkingDirOnExit) { - if (log.isDebugEnabled()) - log.debug("Delete Apache DS working dir " + workingDirectory); - FileUtils.deleteDirectory(workingDirectory); - } - - } - - public void setConfiguration(MutableServerStartupConfiguration configuration) { - this.configuration = configuration; - } - - public void setWorkingDirectory(File workingDirectory) { - this.workingDirectory = workingDirectory; - } - - public void setEnvironment(Properties environment) { - this.environment = environment; - } - - public void setLdifs(List ldifs) { - this.ldifs = ldifs; - } - - public void setLdifDirectory(File ldifDirectory) { - this.ldifDirectory = ldifDirectory; - } - - public void setDeleteWorkingDirOnExit(Boolean deleteWorkingDirOnExit) { - this.deleteWorkingDirOnExit = deleteWorkingDirOnExit; - } - - public void setIgnoredLdifAttributes(List ignoredLdifAttributes) { - this.ignoredLdifAttributes = ignoredLdifAttributes; - } - - public void setLdifPassword(String ldifPassword) { - this.ldifPassword = ldifPassword; - } - - public void setLdifPasswordAttribute(String ldifPasswordAttribute) { - this.ldifPasswordAttribute = ldifPasswordAttribute; - } - -} diff --git a/org.argeo.server.rap.webapp/.project b/org.argeo.server.rap.webapp/.project deleted file mode 100644 index 3ffaae189..000000000 --- a/org.argeo.server.rap.webapp/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.server.rap.webapp - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.server.rap.webapp/.settings/org.eclipse.pde.core.prefs b/org.argeo.server.rap.webapp/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index fd884c249..000000000 --- a/org.argeo.server.rap.webapp/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Mar 01 15:09:47 CET 2011 -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/org.argeo.server.rap.webapp/META-INF/context-template.xml b/org.argeo.server.rap.webapp/META-INF/context-template.xml deleted file mode 100644 index eaf6e86cc..000000000 --- a/org.argeo.server.rap.webapp/META-INF/context-template.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - \ No newline at end of file diff --git a/org.argeo.server.rap.webapp/WEB-INF/applicationContext.xml b/org.argeo.server.rap.webapp/WEB-INF/applicationContext.xml deleted file mode 100644 index 336862453..000000000 --- a/org.argeo.server.rap.webapp/WEB-INF/applicationContext.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - osgibundle:rap-webapp.properties - - - - \ No newline at end of file diff --git a/org.argeo.server.rap.webapp/WEB-INF/osgi.xml b/org.argeo.server.rap.webapp/WEB-INF/osgi.xml deleted file mode 100644 index eeb560743..000000000 --- a/org.argeo.server.rap.webapp/WEB-INF/osgi.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/org.argeo.server.rap.webapp/WEB-INF/security-filters.xml b/org.argeo.server.rap.webapp/WEB-INF/security-filters.xml deleted file mode 100644 index 4c7df6b06..000000000 --- a/org.argeo.server.rap.webapp/WEB-INF/security-filters.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - PATTERN_TYPE_APACHE_ANT - /**=ROLE_USER,ROLE_ADMIN - - - - - - - PATTERN_TYPE_APACHE_ANT - /**=IS_AUTHENTICATED_ANONYMOUSLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${argeo.server.realmName} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.server.rap.webapp/WEB-INF/service-servlet.xml b/org.argeo.server.rap.webapp/WEB-INF/service-servlet.xml deleted file mode 100644 index 7a052199e..000000000 --- a/org.argeo.server.rap.webapp/WEB-INF/service-servlet.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - osgiServiceController - - - - - - - org.eclipse.equinox.http.servlet.HttpServiceServlet - - - osgiService - - - \ No newline at end of file diff --git a/org.argeo.server.rap.webapp/WEB-INF/web.xml b/org.argeo.server.rap.webapp/WEB-INF/web.xml deleted file mode 100644 index 1b6e766e5..000000000 --- a/org.argeo.server.rap.webapp/WEB-INF/web.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - Argeo OSGi Webapp - - - - contextConfigLocation - /WEB-INF/applicationContext.xml - - - - Spring Context - org.springframework.web.context.ContextLoaderListener - - - contextClass - org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext - - - - - service - org.springframework.web.servlet.DispatcherServlet - - contextClass - org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext - - 1 - - - - service - /* - - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - /private - - - springSecurityFilterChain - /basicauth - - - springSecurityFilterChain - /clientauth - - - springSecurityFilterChain - /none - - - springSecurityFilterChain - /public - - - diff --git a/org.argeo.server.rap.webapp/bnd.bnd b/org.argeo.server.rap.webapp/bnd.bnd deleted file mode 100644 index 954f2d349..000000000 --- a/org.argeo.server.rap.webapp/bnd.bnd +++ /dev/null @@ -1,24 +0,0 @@ -Web-ContextPath: ui -Import-Package: org.springframework.beans.factory.config,\ -org.eclipse.equinox.http.servlet,\ -org.springframework.osgi.web.context.support,\ -org.springframework.security,\ -org.springframework.security.context,\ -org.springframework.security.intercept.web,\ -org.springframework.security.providers.anonymous,\ -org.springframework.security.ui,\ -org.springframework.security.ui.basicauth,\ -org.springframework.security.ui.logout,\ -org.springframework.security.ui.rememberme,\ -org.springframework.security.ui.webapp,\ -org.springframework.security.ui.preauth.x509,\ -org.springframework.security.userdetails,\ -org.springframework.security.util,\ -org.springframework.security.vote,\ -org.springframework.security.wrapper,\ -org.springframework.web.context,\ -org.springframework.web.filter,\ -org.springframework.web.servlet,\ -org.springframework.web.servlet.handler,\ -org.springframework.web.servlet.mvc,\ -* \ No newline at end of file diff --git a/org.argeo.server.rap.webapp/build.properties b/org.argeo.server.rap.webapp/build.properties deleted file mode 100644 index 29dea25a4..000000000 --- a/org.argeo.server.rap.webapp/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = META-INF/,\ - WEB-INF/ diff --git a/org.argeo.server.rap.webapp/pom.xml b/org.argeo.server.rap.webapp/pom.xml deleted file mode 100644 index 8c61d3f0b..000000000 --- a/org.argeo.server.rap.webapp/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - - org.argeo.commons - 2.1.12-SNAPSHOT - argeo-commons - .. - - org.argeo.server.rap.webapp - Commons Server RAP Webapp - Integrates into OSGi HTTP registry - \ No newline at end of file diff --git a/org.argeo.server.rap.webapp/rap-webapp.properties b/org.argeo.server.rap.webapp/rap-webapp.properties deleted file mode 100644 index 012255a15..000000000 --- a/org.argeo.server.rap.webapp/rap-webapp.properties +++ /dev/null @@ -1,2 +0,0 @@ -argeo.security.systemKey=argeo -argeo.server.realmName=Argeo \ No newline at end of file