Author: fmeschbe
Date: Sun Aug 15 12:28:54 2010
New Revision: 985662
URL: http://svn.apache.org/viewvc?rev=985662&view=rev
Log:
SLING-1650 Consolidate authentication stuff in a new auth component;
* rename commons/auth to auth/core
* rename extensions/formauth to auth/form
* rename extensions/openidauth to auth/openid
Added:
sling/trunk/bundles/auth/
sling/trunk/bundles/auth/core/
- copied from r985223, sling/trunk/bundles/commons/auth/
sling/trunk/bundles/auth/form/
- copied from r985223, sling/trunk/bundles/extensions/formauth/
sling/trunk/bundles/auth/openid/
- copied from r985223, sling/trunk/bundles/extensions/openidauth/
Removed:
sling/trunk/bundles/commons/auth/
sling/trunk/bundles/extensions/formauth/
sling/trunk/bundles/extensions/openidauth/
Modified:
sling/trunk/bundles/auth/core/pom.xml
sling/trunk/bundles/auth/form/pom.xml
sling/trunk/bundles/auth/openid/pom.xml
Modified: sling/trunk/bundles/auth/core/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/pom.xml?rev=985662&r1=985223&r2=985662&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/pom.xml (original)
+++ sling/trunk/bundles/auth/core/pom.xml Sun Aug 15 12:28:54 2010
@@ -27,7 +27,7 @@
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <artifactId>org.apache.sling.commons.auth</artifactId>
+ <artifactId>org.apache.sling.auth.core</artifactId>
<packaging>bundle</packaging>
<version>0.9.0-SNAPSHOT</version>
@@ -41,9 +41,9 @@
</description>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/auth</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/auth</developerConnection>
-
<url>http://svn.apache.org/viewvc/sling/trunk/bundles/commons/auth</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/auth/core</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/auth/core</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core</url>
</scm>
<build>
@@ -59,8 +59,8 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.commons.auth;version=1.0.0,
- org.apache.sling.commons.auth.spi;version=1.0.0,
+ org.apache.sling.auth.core;version=1.0.0,
+ org.apache.sling.auth.core.spi;version=1.0.0,
org.apache.sling.engine.auth;version=2.0.6
</Export-Package>
<Import-Package>
@@ -68,7 +68,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.sling.commons.auth.impl.*
+ org.apache.sling.auth.core.impl.*
</Private-Package>
<Embed-Dependency>
org.apache.sling.commons.osgi;inline=org/apache/sling/commons/osgi/OsgiUtil.class,
Modified: sling/trunk/bundles/auth/form/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/pom.xml?rev=985662&r1=985223&r2=985662&view=diff
==============================================================================
--- sling/trunk/bundles/auth/form/pom.xml (original)
+++ sling/trunk/bundles/auth/form/pom.xml Sun Aug 15 12:28:54 2010
@@ -25,7 +25,7 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <artifactId>org.apache.sling.formauth</artifactId>
+ <artifactId>org.apache.sling.auth.form</artifactId>
<version>0.9-SNAPSHOT</version>
<packaging>bundle</packaging>
@@ -38,9 +38,9 @@
</description>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/formauth</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/formauth</developerConnection>
-
<url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/auth/form</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/auth/form</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form</url>
</scm>
<build>
@@ -59,10 +59,10 @@
http://sling.apache.org/site/form-based-authenticationhandler.html
</Bundle-DocURL>
<Export-Package>
- org.apache.sling.formauth;version=1.0
+ org.apache.sling.auth.form;version=1.0
</Export-Package>
<Private-Package>
- org.apache.sling.formauth.impl.*
+ org.apache.sling.auth.form.impl.*
</Private-Package>
<Import-Package>
javax.security.auth.callback;
@@ -96,7 +96,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<excludePackageNames>
- org.apache.sling.formauth
+ org.apache.sling.auth.form
</excludePackageNames>
</configuration>
</plugin>
Modified: sling/trunk/bundles/auth/openid/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/pom.xml?rev=985662&r1=985223&r2=985662&view=diff
==============================================================================
--- sling/trunk/bundles/auth/openid/pom.xml (original)
+++ sling/trunk/bundles/auth/openid/pom.xml Sun Aug 15 12:28:54 2010
@@ -27,7 +27,7 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <artifactId>org.apache.sling.openidauth</artifactId>
+ <artifactId>org.apache.sling.auth.openid</artifactId>
<packaging>bundle</packaging>
<version>0.9.1-SNAPSHOT</version>
@@ -38,9 +38,9 @@
</description>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/openidauth</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/openidauth</developerConnection>
-
<url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/openidauth</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/auth/openid</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/auth/openid</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid</url>
</scm>
<build>
@@ -59,11 +59,11 @@
http://sling.apache.org/site/openid-authenticationhandler.html
</Bundle-DocURL>
<Private-Package>
- org.apache.sling.openidauth.impl.*
+ org.apache.sling.auth.openid.impl.*
</Private-Package>
<Export-Package>
- org.apache.sling.openidauth;version=1.0
+ org.apache.sling.auth.openid;version=1.0
</Export-Package>
<Import-Package>
*;resolution:=optional
@@ -84,7 +84,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<excludePackageNames>
- org.apache.sling.openidauth
+ org.apache.sling.auth.openid
</excludePackageNames>
</configuration>
</plugin>
