You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2007/01/13 18:48:35 UTC
svn commit: r495935 - in /cocoon/trunk/blocks/cocoon-auth: ./
cocoon-auth-api/ cocoon-auth-api/src/ cocoon-auth-api/src/main/
cocoon-auth-api/src/main/java/ cocoon-auth-api/src/main/java/org/
cocoon-auth-api/src/main/java/org/apache/ cocoon-auth-api/sr...
Author: cziegeler
Date: Sat Jan 13 09:48:32 2007
New Revision: 495935
URL: http://svn.apache.org/viewvc?view=rev&rev=495935
Log:
Split into api and impl
Added:
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/ (with props)
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/pom.xml (with props)
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/AbstractSecurityHandler.java
- copied unchanged from r495903, cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/AbstractSecurityHandler.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/Application.java
- copied unchanged from r495637, cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/Application.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/ApplicationManager.java
- copied unchanged from r495903, cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/ApplicationManager.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/ApplicationStore.java
- copied unchanged from r495637, cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/ApplicationStore.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/ApplicationUtil.java
- copied unchanged from r495907, cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/ApplicationUtil.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/SecurityHandler.java
- copied unchanged from r495637, cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/SecurityHandler.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardApplication.java
- copied, changed from r495903, cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/StandardApplication.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardUser.java
- copied unchanged from r495637, cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/StandardUser.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/User.java
- copied unchanged from r495637, cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/User.java
Removed:
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/AbstractSecurityHandler.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/Application.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/ApplicationManager.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/ApplicationStore.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/ApplicationUtil.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/SecurityHandler.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/StandardApplication.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/StandardUser.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/User.java
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-auth-sitemap-xconf
Modified:
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/PipelineSecurityHandler.java
cocoon/trunk/blocks/cocoon-auth/pom.xml
Propchange: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jan 13 09:48:32 2007
@@ -0,0 +1,8 @@
+target
+.classpath
+.project
+.wtpmodules
+.deployables
+*.ipr
+*.iml
+.settings
Added: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/pom.xml?view=auto&rev=495935
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/pom.xml (added)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/pom.xml Sat Jan 13 09:48:32 2007
@@ -0,0 +1,71 @@
+<?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.
+-->
+<!--+
+ | @version $Id$
+ |
+ +-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-auth</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cocoon-auth-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Cocoon Authentication API</name>
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>${docs.deploymentBaseUrl}/blocks/auth/${docs.version}/</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <docs.name>Cocoon Authentication</docs.name>
+ <docs.version>1.0</docs.version>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.daisycms</groupId>
+ <artifactId>daisy-maven-plugin</artifactId>
+ <configuration>
+ <navDocId>1227</navDocId>
+ <collection>cdocs-auth</collection>
+ <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core</artifactId>
+ <version>2.2.0-M3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Copied: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardApplication.java (from r495903, cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/StandardApplication.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardApplication.java?view=diff&rev=495935&p1=cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/StandardApplication.java&r1=495903&p2=cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardApplication.java&r2=495935
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/StandardApplication.java (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardApplication.java Sat Jan 13 09:48:32 2007
@@ -18,10 +18,10 @@
*/
package org.apache.cocoon.auth;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.cocoon.auth.impl.AnonymousSecurityHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -52,15 +52,20 @@
}
/** The security handler. */
- protected SecurityHandler handler = new AnonymousSecurityHandler();
+ protected SecurityHandler handler;
/** Attributes. */
- protected Map attributes = new HashMap();
+ protected Map attributes = Collections.synchronizedMap(new HashMap());
/** Application store. */
protected ApplicationStore store;
public void setSecurityHandler(SecurityHandler h) {
+ System.out.println("************************************************************");
+ System.out.println("* *");
+ System.out.println("* Set *" + h);
+ System.out.println("* *");
+ System.out.println("************************************************************");
this.handler = h;
}
Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml?view=diff&rev=495935&r1=495934&r2=495935
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml Sat Jan 13 09:48:32 2007
@@ -62,6 +62,11 @@
<version>2.2.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-auth-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/PipelineSecurityHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/PipelineSecurityHandler.java?view=diff&rev=495935&r1=495934&r2=495935
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/PipelineSecurityHandler.java (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/PipelineSecurityHandler.java Sat Jan 13 09:48:32 2007
@@ -61,7 +61,7 @@
this.logoutResource = logoutResource;
}
- public void setResolver(SourceResolver resolver) {
+ public void setSourceResolver(SourceResolver resolver) {
this.resolver = resolver;
}
Modified: cocoon/trunk/blocks/cocoon-auth/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/pom.xml?view=diff&rev=495935&r1=495934&r2=495935
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-auth/pom.xml Sat Jan 13 09:48:32 2007
@@ -31,9 +31,10 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-auth</artifactId>
<packaging>pom</packaging>
- <name>Cocoon Authentication Framework [modules]</name>
+ <name>Cocoon Authentication[modules]</name>
<version>1-SNAPSHOT</version>
<modules>
+ <module>cocoon-auth-api</module>
<module>cocoon-auth-impl</module>
</modules>
</project>