You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/05/01 03:39:06 UTC

svn commit: r939899 - in /shindig/branches/1.0.x: ./ assembly/ etc/ etc/cruisecontrol/ features/ java/ java/common/ java/gadgets/ java/samples/ java/server/ java/social-api/ java/social-api/src/test/java/org/apache/shindig/social/dataservice/integratio...

Author: lindner
Date: Sat May  1 01:39:06 2010
New Revision: 939899

URL: http://svn.apache.org/viewvc?rev=939899&view=rev
Log:
de-incubate, prep for 1.0.1

Modified:
    shindig/branches/1.0.x/BUILD-JAVA
    shindig/branches/1.0.x/COMMITTERS
    shindig/branches/1.0.x/README
    shindig/branches/1.0.x/assembly/pom.xml
    shindig/branches/1.0.x/etc/cruisecontrol/config.xml
    shindig/branches/1.0.x/etc/to-committers.xsl
    shindig/branches/1.0.x/features/README
    shindig/branches/1.0.x/features/pom.xml
    shindig/branches/1.0.x/java/README
    shindig/branches/1.0.x/java/common/pom.xml
    shindig/branches/1.0.x/java/gadgets/README
    shindig/branches/1.0.x/java/gadgets/pom.xml
    shindig/branches/1.0.x/java/pom.xml
    shindig/branches/1.0.x/java/samples/pom.xml
    shindig/branches/1.0.x/java/server/README
    shindig/branches/1.0.x/java/server/pom.xml
    shindig/branches/1.0.x/java/social-api/pom.xml
    shindig/branches/1.0.x/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
    shindig/branches/1.0.x/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
    shindig/branches/1.0.x/javascript/README
    shindig/branches/1.0.x/javascript/sampledata/canonicaldb.json
    shindig/branches/1.0.x/php/README
    shindig/branches/1.0.x/php/docs/README.lighttpd
    shindig/branches/1.0.x/pom.xml

Modified: shindig/branches/1.0.x/BUILD-JAVA
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/BUILD-JAVA?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/BUILD-JAVA (original)
+++ shindig/branches/1.0.x/BUILD-JAVA Sat May  1 01:39:06 2010
@@ -93,5 +93,5 @@ Where
 
 
    
-For more information, see http://incubator.apache.org/projects/shindig.html
+For more information, see http://shindig.apache.org/
 

Modified: shindig/branches/1.0.x/COMMITTERS
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/COMMITTERS?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/COMMITTERS (original)
+++ shindig/branches/1.0.x/COMMITTERS Sat May  1 01:39:06 2010
@@ -4,7 +4,7 @@ for that, you'd need to look over the lo
 patch contributors.
 
 If you have a question or comment, it's probably best to mail
-shindig-dev@incubator.apache.org, rather than mailing any of these
+dev@shindig.apache.org, rather than mailing any of these
 people directly.
 
 Blanket commit access:

Modified: shindig/branches/1.0.x/README
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/README?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/README (original)
+++ shindig/branches/1.0.x/README Sat May  1 01:39:06 2010
@@ -9,7 +9,7 @@
   Documentation
   -------------
 
-  The most up-to-date documentation can be found at http://incubator.apache.org/shindig/.
+  The most up-to-date documentation can be found at http://shindigapache.org/
 
   Read BUILD-JAVA for instructions on how to build and run the Java server.
 
@@ -30,10 +30,10 @@
   Shindig URLS
   ------------
 
-  Home Page:          http://incubator.apache.org/shindig/
-  Downloads:          http://incubator.apache.org/shindig/download/index.html
-  Mailing Lists:      http://incubator.apache.org/shindig/mail-lists.html
-  Source Code:        http://svn.apache.org/repos/asf/incubator/shindig/
+  Home Page:          http://shindig.apache.org/
+  Downloads:          http://shindig.apache.org/download/index.html
+  Mailing Lists:      http://shindig.apache.org/mail-lists.html
+  Source Code:        http://svn.apache.org/repos/asf/shindig/
   Issue Tracking:     https://issues.apache.org/jira/browse/SHINDIG
   Wiki:               http://cwiki.apache.org/confluence/display/SHINDIG/
 

Modified: shindig/branches/1.0.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/assembly/pom.xml?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/assembly/pom.xml (original)
+++ shindig/branches/1.0.x/assembly/pom.xml Sat May  1 01:39:06 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-parent</artifactId>
-    <version>1.0.1-incubating-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <relativePath>../java/pom.xml</relativePath>
   </parent>
 
@@ -33,9 +33,9 @@
   <description>Assembles the PHP code base into a deployment package.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/assembly</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/assembly</developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/branches/1.0.x/assembly</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/branches/1.0.x/assembly</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/branches/1.0.x/assembly</url>
   </scm>
 
   <build>

Modified: shindig/branches/1.0.x/etc/cruisecontrol/config.xml
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/etc/cruisecontrol/config.xml?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/etc/cruisecontrol/config.xml (original)
+++ shindig/branches/1.0.x/etc/cruisecontrol/config.xml Sat May  1 01:39:06 2010
@@ -46,14 +46,14 @@
 
     <publishers>
       <onsuccess>
-        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/gadgets/target/shindig-gadgets-1.0.0-incubating-SNAPSHOT-sources.jar"/>
-        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/gadgets/target/shindig-gadgets-1.0.0-incubating-SNAPSHOT.jar"/>
-        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/server/target/shindig-server-1.0.0-incubating-SNAPSHOT-sources.jar"/>
-        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/server/target/shindig-server-1.0.0-incubating-SNAPSHOT.war"/>
-        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/common/target/shindig-common-1.0.0-incubating-SNAPSHOT-sources.jar"/>
-        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/common/target/shindig-common-1.0.0-incubating-SNAPSHOT.jar"/>
-        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/social-api/target/shindig-social-api-1.0.0-incubating-SNAPSHOT-sources.jar"/>
-        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/social-api/target/shindig-social-api-1.0.0-incubating-SNAPSHOT.jar"/>
+        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/gadgets/target/shindig-gadgets-1.0.0-SNAPSHOT-sources.jar"/>
+        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/gadgets/target/shindig-gadgets-1.0.0-SNAPSHOT.jar"/>
+        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/server/target/shindig-server-1.0.0-SNAPSHOT-sources.jar"/>
+        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/server/target/shindig-server-1.0.0-SNAPSHOT.war"/>
+        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/common/target/shindig-common-1.0.0-SNAPSHOT-sources.jar"/>
+        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/common/target/shindig-common-1.0.0-SNAPSHOT.jar"/>
+        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/social-api/target/shindig-social-api-1.0.0-SNAPSHOT-sources.jar"/>
+        <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/social-api/target/shindig-social-api-1.0.0-SNAPSHOT.jar"/>
       </onsuccess>
     </publishers>
 

Modified: shindig/branches/1.0.x/etc/to-committers.xsl
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/etc/to-committers.xsl?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/etc/to-committers.xsl (original)
+++ shindig/branches/1.0.x/etc/to-committers.xsl Sat May  1 01:39:06 2010
@@ -36,7 +36,7 @@ for that, you'd need to look over the lo
 patch contributors.
 
 If you have a question or comment, it's probably best to mail
-shindig-dev@incubator.apache.org, rather than mailing any of these
+dev@shindig.apache.org, rather than mailing any of these
 people directly.
 
 Blanket commit access:&#xa;</xsl:text>

Modified: shindig/branches/1.0.x/features/README
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/features/README?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/features/README (original)
+++ shindig/branches/1.0.x/features/README Sat May  1 01:39:06 2010
@@ -11,7 +11,7 @@
   Documentation
   -------------
 
-  The most up-to-date documentation can be found at http://incubator.apache.org/shindig/
+  The most up-to-date documentation can be found at http://shindig.apache.org/
 
   Using features
   --------------
@@ -66,9 +66,9 @@
   Shindig URLS
   ------------
 
-  Home Page:          http://incubator.apache.org/shindig/
-  Downloads:          http://incubator.apache.org/shindig/download/index.html
-  Mailing Lists:      http://incubator.apache.org/shindig/mail-lists.html
-  Source Code:        http://svn.apache.org/repos/asf/incubator/shindig/
+  Home Page:          http://shindig.apache.org/
+  Downloads:          http://shindig.apache.org/download/index.html
+  Mailing Lists:      http://shindig.apache.org/mail-lists.html
+  Source Code:        http://svn.apache.org/repos/asf/shindig/
   Issue Tracking:     https://issues.apache.org/jira/browse/SHINDIG
   Wiki:               http://cwiki.apache.org/confluence/display/SHINDIG/

Modified: shindig/branches/1.0.x/features/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/features/pom.xml?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/features/pom.xml (original)
+++ shindig/branches/1.0.x/features/pom.xml Sat May  1 01:39:06 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-parent</artifactId>
-    <version>1.0.1-incubating-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <relativePath>../java/pom.xml</relativePath>
   </parent>
 
@@ -35,9 +35,9 @@
   </description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/features</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/features</developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/features</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/branches/1.0.x/features</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/branches/1.0.x/features</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/branches/1.0.x/features</url>
   </scm>
 
   <build>

Modified: shindig/branches/1.0.x/java/README
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/README?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/java/README (original)
+++ shindig/branches/1.0.x/java/README Sat May  1 01:39:06 2010
@@ -12,8 +12,8 @@
   Documentation
   -------------
 
-  The most up-to-date documentation can be found at http://incubator.apache.org/shindig/
-  and at http://incubator.apache.org/shindig/developers/java/index.html for specific 
+  The most up-to-date documentation can be found at http://shindig.apache.org/
+  and at http://shindig.apache.org/developers/java/index.html for specific 
   Java documentation.
 
   Release Notes
@@ -61,10 +61,10 @@
   Shindig URLS
   ------------
 
-  Home Page:          http://incubator.apache.org/shindig/
-  Downloads:          http://incubator.apache.org/shindig/download/index.html
-  Mailing Lists:      http://incubator.apache.org/shindig/mail-lists.html
-  Source Code:        http://svn.apache.org/repos/asf/incubator/shindig/
+  Home Page:          http://shindig.apache.org/
+  Downloads:          http://shindig.apache.org/download/index.html
+  Mailing Lists:      http://shindig.apache.org/mail-lists.html
+  Source Code:        http://svn.apache.org/repos/asf/shindig/
   Issue Tracking:     https://issues.apache.org/jira/browse/SHINDIG
   Wiki:               http://cwiki.apache.org/confluence/display/SHINDIG/
 

Modified: shindig/branches/1.0.x/java/common/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/common/pom.xml?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/java/common/pom.xml (original)
+++ shindig/branches/1.0.x/java/common/pom.xml Sat May  1 01:39:06 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-parent</artifactId>
-    <version>1.0.1-incubating-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -33,9 +33,9 @@
   <description>Common java code for Shindig</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/common</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/common</developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/common</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/branches/1.0.x/java/common</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/branches/1.0.x/java/common</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/common</url>
   </scm>
 
   <build>

Modified: shindig/branches/1.0.x/java/gadgets/README
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/gadgets/README?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/java/gadgets/README (original)
+++ shindig/branches/1.0.x/java/gadgets/README Sat May  1 01:39:06 2010
@@ -9,4 +9,4 @@ http://localhost:<port>/gadgets/ifr?url=
 Example: http://localhost:<port>/gadgets/ifr?url=http://www.labpixies.com/campaigns/todo/todo.xml
 
 
-For more information, see http://incubator.apache.org/projects/shindig.html
+For more information, see http://shindig.apache.org/

Modified: shindig/branches/1.0.x/java/gadgets/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/gadgets/pom.xml?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/java/gadgets/pom.xml (original)
+++ shindig/branches/1.0.x/java/gadgets/pom.xml Sat May  1 01:39:06 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-parent</artifactId>
-    <version>1.0.1-incubating-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -34,9 +34,9 @@
     all javascript required by the OpenSocial specification.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/gadgets</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/gadgets</developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/branches/1.0.x/java/gadgets</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/branches/1.0.x/java/gadgets</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/gadgets</url>
   </scm>
 
   <build>

Modified: shindig/branches/1.0.x/java/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/pom.xml?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/java/pom.xml (original)
+++ shindig/branches/1.0.x/java/pom.xml Sat May  1 01:39:06 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>1.0.1-incubating-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>shindig-parent</artifactId>
@@ -40,9 +40,9 @@
   </modules>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java</developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/branches/1.0.x/java</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/branches/1.0.x/java</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/branches/1.0.x/java</url>
   </scm>
 
   <properties>

Modified: shindig/branches/1.0.x/java/samples/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/samples/pom.xml?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/java/samples/pom.xml (original)
+++ shindig/branches/1.0.x/java/samples/pom.xml Sat May  1 01:39:06 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-parent</artifactId>
-    <version>1.0.1-incubating-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -33,9 +33,9 @@
   <description>Provides Sample implementations of the SPI and API's inside the core of Shindig.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/samples</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/samples</developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/branches/1.0.x/java/samples</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/branches/1.0.x/java/samples</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/samples</url>
   </scm>
 
   <repositories>

Modified: shindig/branches/1.0.x/java/server/README
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/server/README?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/java/server/README (original)
+++ shindig/branches/1.0.x/java/server/README Sat May  1 01:39:06 2010
@@ -7,4 +7,4 @@ the gadget rendering and social-api serv
 Please see BUILD-JAVA in the base project directory for information.
 
 
-For more information, see http://incubator.apache.org/projects/shindig.html
+For more information, see http://shindig.apache.org

Modified: shindig/branches/1.0.x/java/server/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/server/pom.xml?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/java/server/pom.xml (original)
+++ shindig/branches/1.0.x/java/server/pom.xml Sat May  1 01:39:06 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-parent</artifactId>
-    <version>1.0.1-incubating-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -33,9 +33,9 @@
   <description>Default server war containing both the gadget rendering code and the social api code.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/server</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/server</developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/server</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/branches/1.0.x/java/server</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/branches/1.0.x/java/server</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/server</url>
   </scm>
 
   <properties>

Modified: shindig/branches/1.0.x/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/social-api/pom.xml?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/java/social-api/pom.xml (original)
+++ shindig/branches/1.0.x/java/social-api/pom.xml Sat May  1 01:39:06 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-parent</artifactId>
-    <version>1.0.1-incubating-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -33,9 +33,9 @@
   <description>Serves OpenSocial Data and the RESTful APIs.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/social-api</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/social-api</developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/branches/1.0.x/java/social-api</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/branches/1.0.x/java/social-api</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/social-api</url>
   </scm>
 
   <build>

Modified: shindig/branches/1.0.x/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java (original)
+++ shindig/branches/1.0.x/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java Sat May  1 01:39:06 2010
@@ -92,7 +92,7 @@ public class RestfulJsonPeopleTest exten
 
     canonical.setBirthday(new Date());
     canonical.setDrinker(new EnumImpl<Enum.Drinker>(Enum.Drinker.SOCIALLY));
-    ListField email = new ListFieldImpl("work", "shindig-dev@incubator.apache.org");
+    ListField email = new ListFieldImpl("work", "dev@shindig.apache.org");
     canonical.setEmails(Lists.newArrayList(email));
 
     canonical.setEthnicity("developer");
@@ -116,7 +116,7 @@ public class RestfulJsonPeopleTest exten
     job1.setStartDate(new Date());
     job1.setSubField("Development");
     job1.setTitle("Grand PooBah");
-    job1.setWebpage("http://incubator.apache.org/projects/shindig.html");
+    job1.setWebpage("http://shindig.apache.org/");
     job1.setType("job");
 
     Organization job2 = new OrganizationImpl();

Modified: shindig/branches/1.0.x/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java (original)
+++ shindig/branches/1.0.x/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java Sat May  1 01:39:06 2010
@@ -104,7 +104,7 @@ public class RestfulXmlPeopleTest extend
     canonical.setBirthday(new Date());
     canonical.setDrinker(new EnumImpl<Enum.Drinker>(Enum.Drinker.SOCIALLY));
     ListField email = new ListFieldImpl("work",
-        "shindig-dev@incubator.apache.org");
+        "dev@shindig.apache.org");
     canonical.setEmails(Lists.newArrayList(email));
 
     canonical.setEthnicity("developer");
@@ -129,7 +129,7 @@ public class RestfulXmlPeopleTest extend
     job1.setStartDate(new Date());
     job1.setSubField("Development");
     job1.setTitle("Grand PooBah");
-    job1.setWebpage("http://incubator.apache.org/projects/shindig.html");
+    job1.setWebpage("http://shindig.apache.org/");
     job1.setType("job");
 
     Organization job2 = new OrganizationImpl();

Modified: shindig/branches/1.0.x/javascript/README
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/javascript/README?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/javascript/README (original)
+++ shindig/branches/1.0.x/javascript/README Sat May  1 01:39:06 2010
@@ -11,7 +11,7 @@
   Documentation
   -------------
 
-  The most up-to-date documentation can be found at http://incubator.apache.org/shindig/
+  The most up-to-date documentation can be found at http://shindig.apache.org/
   
   Using Shindig Gadget Container JavaScript
   -----------------------------------------
@@ -107,9 +107,9 @@
   Shindig URLS
   ------------
 
-  Home Page:          http://incubator.apache.org/shindig/
-  Downloads:          http://incubator.apache.org/shindig/download/index.html
-  Mailing Lists:      http://incubator.apache.org/shindig/mail-lists.html
-  Source Code:        http://svn.apache.org/repos/asf/incubator/shindig/
+  Home Page:          http://shindig.apache.org/
+  Downloads:          http://shindig.apache.org/download/index.html
+  Mailing Lists:      http://shindig.apache.org/mail-lists.html
+  Source Code:        http://svn.apache.org/repos/asf/shindig/
   Issue Tracking:     https://issues.apache.org/jira/browse/SHINDIG
   Wiki:               http://cwiki.apache.org/confluence/display/SHINDIG/

Modified: shindig/branches/1.0.x/javascript/sampledata/canonicaldb.json
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/javascript/sampledata/canonicaldb.json?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/javascript/sampledata/canonicaldb.json (original)
+++ shindig/branches/1.0.x/javascript/sampledata/canonicaldb.json Sat May  1 01:39:06 2010
@@ -78,7 +78,7 @@
 "displayValue" : "Socially"
 },
 "emails" : [{
-"value" : "shindig-dev@incubator.apache.org",
+"value" : "dev@shindig.apache.org",
 "type" : "work"
 }],
 "ethnicity" : "developer",
@@ -103,7 +103,7 @@
 "startDate" : "1995-01-01",
 "subField" : "Development",
 "title" : "Grand PooBah",
-"webpage" : "http://incubator.apache.org/projects/shindig.html",
+"webpage" : "http://shindig.apache.org/",
 "type" : "job"
 },{
 "address" : {

Modified: shindig/branches/1.0.x/php/README
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/php/README?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/php/README (original)
+++ shindig/branches/1.0.x/php/README Sat May  1 01:39:06 2010
@@ -12,8 +12,8 @@
   Documentation
   -------------
 
-  The most up-to-date documentation can be found at http://incubator.apache.org/shindig/
-  and at http://incubator.apache.org/shindig/developers/php/index.html 
+  The most up-to-date documentation can be found at http://shindig.apache.org/
+  and at http://shindig.apache.org/developers/php/index.html 
   for specific PHP documentation.
 
   Read javascript/README for instructions for using the Shindig Gadget 
@@ -119,10 +119,10 @@
   Shindig URLS
   ------------
 
-  Home Page:          http://incubator.apache.org/shindig/
-  Downloads:          http://incubator.apache.org/shindig/download/index.html
-  Mailing Lists:      http://incubator.apache.org/shindig/mail-lists.html
-  Source Code:        http://svn.apache.org/repos/asf/incubator/shindig/
+  Home Page:          http://shindig.apache.org/
+  Downloads:          http://shindig.apache.org/download/index.html
+  Mailing Lists:      http://shindig.apache.org/mail-lists.html
+  Source Code:        http://svn.apache.org/repos/asf/shindig/
   Issue Tracking:     https://issues.apache.org/jira/browse/SHINDIG
   Wiki:               http://cwiki.apache.org/confluence/display/SHINDIG/
 

Modified: shindig/branches/1.0.x/php/docs/README.lighttpd
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/php/docs/README.lighttpd?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/php/docs/README.lighttpd (original)
+++ shindig/branches/1.0.x/php/docs/README.lighttpd Sat May  1 01:39:06 2010
@@ -19,7 +19,7 @@ code from its Subversion repository
 
 mkdir /var/www/html/shindig
 cd /var/www/html/shindig
-svn co http://svn.apache.org/repos/asf/incubator/shindig/trunk/ .
+svn co http://svn.apache.org/repos/asf/shindig/trunk/ .
 
 
 Running Shindig

Modified: shindig/branches/1.0.x/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/1.0.x/pom.xml?rev=939899&r1=939898&r2=939899&view=diff
==============================================================================
--- shindig/branches/1.0.x/pom.xml (original)
+++ shindig/branches/1.0.x/pom.xml Sat May  1 01:39:06 2010
@@ -28,7 +28,7 @@
 
   <groupId>org.apache.shindig</groupId>
   <artifactId>shindig-project</artifactId>
-  <version>1.0.1-incubating-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Shindig Project</name>
@@ -37,7 +37,7 @@
     backend APIs and proxy required for hosting OpenSocial
     applications.
   </description>
-  <url>http://incubator.apache.org/shindig</url>
+  <url>http://shindig.apache.org/</url>
   <inceptionYear>2007</inceptionYear>
 
   <prerequisites>
@@ -48,9 +48,9 @@
   <!-- S C M                                                                  -->
   <!-- ====================================================================== -->
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating</developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/branches/1.0.x</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/branches/1.0.x</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/branches/1.0.x</url>
   </scm>
 
   <!-- ====================================================================== -->
@@ -76,7 +76,7 @@
     <!-- This is the technical website for Shindig 1.0.x -->
     <site>
       <id>apache.website</id>
-      <url>scp://people.apache.org/www/incubator.apache.org/shindig/shindig-1.0.x</url>
+      <url>scp://people.apache.org/www/shindig.apache.org/shindig-1.0.x</url>
     </site>
   </distributionManagement>
 
@@ -86,25 +86,25 @@
   <mailingLists>
     <mailingList>
       <name>Shindig Dev List</name>
-      <subscribe>shindig-dev-subscribe@incubator.apache.org</subscribe>
-      <unsubscribe>shindig-dev-unsubscribe@incubator.apache.org</unsubscribe>
-      <post>shindig-dev@incubator.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-shindig-dev/</archive>
+      <subscribe>dev-subscribe@shindig.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@shindig.apache.org</unsubscribe>
+      <post>dev@shindig.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/shindig-dev/</archive>
       <otherArchives>
         <otherArchive>http://shindig-dev.markmail.org/</otherArchive>
       </otherArchives>
     </mailingList>
     <mailingList>
       <name>Shindig Commit List</name>
-      <subscribe>shindig-commits-subscribe@incubator.apache.org</subscribe>
-      <unsubscribe>shindig-commits-unsubscribe@incubator.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-shindig-commits/</archive>
+      <subscribe>commits-subscribe@shindig.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@shindig.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/shindig-commits/</archive>
     </mailingList>
     <mailingList>
       <name>Shindig Issues List</name>
-      <subscribe>shindig-issues-subscribe@incubator.apache.org</subscribe>
-      <unsubscribe>shindig-issues-unsubscribe@incubator.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-shindig-issues/</archive>
+      <subscribe>issues-subscribe@shindig.apache.org</subscribe>
+      <unsubscribe>issues-unsubscribe@shindig.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/shindig-issues/</archive>
     </mailingList>
   </mailingLists>
 
@@ -496,7 +496,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-site-plugin</artifactId>
             <configuration>
-              <stagingSiteURL>scp://people.apache.org/www/incubator.apache.org/shindig/shindig-1.0.x/${pom.version}</stagingSiteURL>
+              <stagingSiteURL>scp://people.apache.org/www/shindig.apache.org/shindig-1.0.x/${pom.version}</stagingSiteURL>
             </configuration>
           </plugin>
         </plugins>
@@ -509,8 +509,8 @@
             <artifactId>maven-checkstyle-plugin</artifactId>
             <version>2.2</version>
             <configuration>
-              <configLocation>http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/site/checkstyle.xml</configLocation>
-              <headerLocation>http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/site/java.header</headerLocation>
+              <configLocation>http://svn.apache.org/repos/asf/shindig/branches/1.0.x/site/checkstyle.xml</configLocation>
+              <headerLocation>http://svn.apache.org/repos/asf/shindig/branches/1.0.x/site/java.header</headerLocation>
               <encoding>${project.build.sourceEncoding}</encoding>
             </configuration>
           </plugin>
@@ -962,7 +962,6 @@
             <configuration>
               <resourceBundles>
                 <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-                <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
               </resourceBundles>
             </configuration>
           </execution>