jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r897964 - in /jackrabbit/branches/2.0: ./ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProviderTest.java pom.xml
Date Mon, 11 Jan 2010 17:48:01 GMT
Author: jukka
Date: Mon Jan 11 17:48:01 2010
New Revision: 897964

URL: http://svn.apache.org/viewvc?rev=897964&view=rev
Log:
2.0: Merged revisions 896908 and 896942 (JCR-2455 and JCR-2452)

Modified:
    jackrabbit/branches/2.0/   (props changed)
    jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProviderTest.java
    jackrabbit/branches/2.0/pom.xml

Propchange: jackrabbit/branches/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 11 17:48:01 2010
@@ -2,4 +2,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896940
+/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942

Modified: jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProviderTest.java?rev=897964&r1=897963&r2=897964&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProviderTest.java
(original)
+++ jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProviderTest.java
Mon Jan 11 17:48:01 2010
@@ -114,7 +114,7 @@
         for (Principal p : principals) {
             Principal testPrinc = new TestPrincipal(p.getName());
             principalProvider.getGroupMembership(testPrinc);
-            Principal fromProvider = ((DefaultPrincipalProvider) principalProvider).providePrincipal(p.getName());
+            Principal fromProvider = principalProvider.getPrincipal(p.getName());
 
             assertNotSame(testPrinc, fromProvider);
             assertFalse(fromProvider instanceof TestPrincipal);

Modified: jackrabbit/branches/2.0/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/pom.xml?rev=897964&r1=897963&r2=897964&view=diff
==============================================================================
--- jackrabbit/branches/2.0/pom.xml (original)
+++ jackrabbit/branches/2.0/pom.xml Mon Jan 11 17:48:01 2010
@@ -75,6 +75,11 @@
   <profiles>
     <profile>
       <id>apache-release</id>
+      <properties>
+        <username>${user.name}</username>
+        <keyfile>${user.home}/.ssh/id_rsa</keyfile>
+        <passphrase></passphrase>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -93,6 +98,99 @@
               </execution>
             </executions>
           </plugin>
+          <!-- JCR-2455: Automatic staging of non-Maven release artifacts -->
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>deploy</phase>
+                <configuration>
+                  <tasks>
+                    <mkdir dir="${basedir}/target/${project.version}"/>
+                    <copy todir="${basedir}/target/${project.version}"
+                          flatten="true">
+                      <fileset dir="${basedir}">
+                        <include name="RELEASE-NOTES.txt"/>
+                        <include name="target/*-src.zip*"/>
+                        <include name="jackrabbit-standalone/target/*-${project.version}.jar*"/>
+                        <include name="jackrabbit-webapp/target/*-${project.version}.war*"/>
+                        <include name="jackrabbit-jca/target/*-${project.version}.rar*"/>
+                      </fileset>
+                    </copy>
+                    <checksum algorithm="MD5" fileext=".md5">
+                      <fileset dir="${basedir}/target/${project.version}">
+                        <include name="*.zip"/>
+                        <include name="*.?ar"/>
+                      </fileset>
+                    </checksum>
+                    <checksum algorithm="SHA1" fileext=".sha">
+                      <fileset dir="${basedir}/target/${project.version}">
+                        <include name="*.zip"/>
+                        <include name="*.?ar"/>
+                      </fileset>
+                    </checksum>
+                    <scp todir="${username}@people.apache.org:public_html/jackrabbit"
+                         keyfile="${keyfile}" passphrase="${passphrase}"
+                         sftp="true" verbose="true">
+                      <fileset dir="${basedir}/target">
+                        <include name="${project.version}/*"/>
+                      </fileset>
+                    </scp>
+                    <checksum file="${basedir}/target/${project.version}/jackrabbit-${project.version}-src.zip"
+                              algorithm="SHA1" property="checksum"/>
+                    <echo file="${basedir}/target/vote.txt">
+From: ${username}@apache.org
+To: dev@jackrabbit.apache.org
+Subject: [VOTE] Release Apache Jackrabbit ${project.version}
+
+A candidate for the Jackrabbit ${project.version} release is available at:
+
+    http://people.apache.org/~${username}/jackrabbit/${project.version}/
+
+The release candidate is a zip archive of the sources in:
+
+    http://svn.apache.org/repos/asf/jackrabbit/tags/${project.version}/
+
+The SHA1 checksum of the archive is ${checksum}.
+
+Please vote on releasing this package as Apache Jackrabbit ${project.version}.
+The vote is open for the next 72 hours and passes if a majority of at
+least three +1 Jackrabbit PMC votes are cast.
+
+    [ ] +1 Release this package as Apache Jackrabbit ${project.version}
+    [ ] -1 Do not release this package because...${line.separator}
+                    </echo>
+                    <echo/>
+                    <echo>
+The release candidate has been deployed to:
+
+    http://people.apache.org/~${username}/jackrabbit/${project.version}/
+
+A release vote template has been generated for you:
+
+    file://${basedir}/target/vote.txt
+                    </echo>
+                    <echo/>
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                 <groupId>org.apache.ant</groupId>
+                 <artifactId>ant-jsch</artifactId>
+                 <version>1.7.1</version>
+               </dependency>
+              <dependency>
+                 <groupId>com.jcraft</groupId>
+                 <artifactId>jsch</artifactId>
+                 <version>0.1.42</version>
+               </dependency>
+            </dependencies>
+          </plugin>
         </plugins>
       </build>
     </profile>



Mime
View raw message