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/06 16:07:03 UTC

svn commit: r941746 - in /shindig/trunk: ./ assembly/src/main/assembly/binary-src/ content/sampledata/ etc/ features/ java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/ java/samples/src/test/resources/sampledata/ java/server/ java...

Author: lindner
Date: Thu May  6 14:07:02 2010
New Revision: 941746

URL: http://svn.apache.org/viewvc?rev=941746&view=rev
Log:
remove more incubator cruft

Modified:
    shindig/trunk/BUILD-JAVA
    shindig/trunk/COMMITTERS
    shindig/trunk/assembly/src/main/assembly/binary-src/README
    shindig/trunk/content/sampledata/canonicaldb.json
    shindig/trunk/etc/to-committers.xsl
    shindig/trunk/features/pom.xml
    shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
    shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java
    shindig/trunk/java/samples/src/test/resources/sampledata/canonicaldb.json
    shindig/trunk/java/server/README
    shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
    shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
    shindig/trunk/php/README
    shindig/trunk/php/docs/README.lighttpd
    shindig/trunk/pom.xml

Modified: shindig/trunk/BUILD-JAVA
URL: http://svn.apache.org/viewvc/shindig/trunk/BUILD-JAVA?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/BUILD-JAVA (original)
+++ shindig/trunk/BUILD-JAVA Thu May  6 14:07:02 2010
@@ -6,7 +6,7 @@ Checking out the source code from SVN
 2) Create a subdirectory and checkout the Apache Shindig code from its Subversion repository
   * mkdir ~/src/shindig (or wherever you'd like to put it)
   * cd ~/src/shindig
-3) svn co http://svn.apache.org/repos/asf/incubator/shindig/trunk/ .
+3) svn co http://svn.apache.org/repos/asf/shindig/trunk/ .
 
 
 Installing and running the various java servers
@@ -131,7 +131,7 @@ To see the cajoled code (Firefox only), 
 Additional Reading
 ----------------------------------
 
-For more information, see http://incubator.apache.org/projects/shindig.html
+For more information, see http://shindig.apache.org/
 
 Read javascript/README for instructions for using the Apache Shindig Gadget Container JavaScript
 to enable your page to render Gadgets using gmodules.com or a server started up as described above.

Modified: shindig/trunk/COMMITTERS
URL: http://svn.apache.org/viewvc/shindig/trunk/COMMITTERS?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/COMMITTERS (original)
+++ shindig/trunk/COMMITTERS Thu May  6 14:07:02 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/trunk/assembly/src/main/assembly/binary-src/README
URL: http://svn.apache.org/viewvc/shindig/trunk/assembly/src/main/assembly/binary-src/README?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/assembly/src/main/assembly/binary-src/README (original)
+++ shindig/trunk/assembly/src/main/assembly/binary-src/README Thu May  6 14:07:02 2010
@@ -7,4 +7,4 @@ the sample server and the individual jar
 social-api projects. If you intend to work with the Shindig source, then please download a 
 source distribution.
 
-For more information, see http://incubator.apache.org/shindig/
+For more information, see http://shindig.apache.org/

Modified: shindig/trunk/content/sampledata/canonicaldb.json
URL: http://svn.apache.org/viewvc/shindig/trunk/content/sampledata/canonicaldb.json?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/content/sampledata/canonicaldb.json (original)
+++ shindig/trunk/content/sampledata/canonicaldb.json Thu May  6 14:07:02 2010
@@ -77,7 +77,7 @@
 "displayValue" : "Socially"
 },
 "emails" : [{
-"value" : "shindig-dev@incubator.apache.org",
+"value" : "dev@shindig.apache.org",
 "type" : "work"
 }],
 "ethnicity" : "developer",
@@ -102,7 +102,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/trunk/etc/to-committers.xsl
URL: http://svn.apache.org/viewvc/shindig/trunk/etc/to-committers.xsl?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/etc/to-committers.xsl (original)
+++ shindig/trunk/etc/to-committers.xsl Thu May  6 14:07:02 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/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/features/pom.xml?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/features/pom.xml (original)
+++ shindig/trunk/features/pom.xml Thu May  6 14:07:02 2010
@@ -36,9 +36,9 @@
   </description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/trunk/features</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/features</developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/shindig/trunk/features</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/features</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/features</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/features</url>
   </scm>
 
   <pluginRepositories>

Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java Thu May  6 14:07:02 2010
@@ -384,7 +384,7 @@ public class SpiDatabaseBootstrap {
     
     List<ListField> emails = new ArrayList<ListField>();
     EmailDb email = new EmailDb();
-    email.setValue("shindig-dev@incubator.apache.org");
+    email.setValue("dev@shindig.apache.org");
     email.setType("work");
     emails.add(email);
     person.setEmails(emails);
@@ -414,7 +414,7 @@ public class SpiDatabaseBootstrap {
     organization1.setStartDate(buildDate("1995-01-01"));
     organization1.setSubField("Development");
     organization1.setTitle("Grand PooBah");
-    organization1.setWebpage("http://incubator.apache.org/projects/shindig.html");
+    organization1.setWebpage("http://shindig.apache.org/");
     organization1.setType("job");
     
     PersonOrganizationDb organization2 = new PersonOrganizationDb();

Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java Thu May  6 14:07:02 2010
@@ -117,7 +117,7 @@ public class SpiTestUtil {
 
     canonical.setBirthday(buildDate("1975-01-01"));
     canonical.setDrinker(new EnumImpl<Drinker>(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");
@@ -141,7 +141,7 @@ public class SpiTestUtil {
     job1.setStartDate(buildDate("1995-01-01"));
     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/trunk/java/samples/src/test/resources/sampledata/canonicaldb.json
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/resources/sampledata/canonicaldb.json?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/resources/sampledata/canonicaldb.json (original)
+++ shindig/trunk/java/samples/src/test/resources/sampledata/canonicaldb.json Thu May  6 14:07:02 2010
@@ -77,7 +77,7 @@
 "displayValue" : "Socially"
 },
 "emails" : [{
-"value" : "shindig-dev@incubator.apache.org",
+"value" : "dev@shindig.apache.org",
 "type" : "work"
 }],
 "ethnicity" : "developer",
@@ -102,7 +102,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/trunk/java/server/README
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/README?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/java/server/README (original)
+++ shindig/trunk/java/server/README Thu May  6 14:07:02 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/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java Thu May  6 14:07:02 2010
@@ -99,7 +99,7 @@ public class RestfulJsonPeopleTest exten
 
     canonical.setBirthday(new Date());
     canonical.setDrinker(new EnumImpl<Drinker>(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");
@@ -123,7 +123,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/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java Thu May  6 14:07:02 2010
@@ -102,7 +102,7 @@ public class RestfulXmlPeopleTest extend
     canonical.setBirthday(new Date());
     canonical.setDrinker(new EnumImpl<Drinker>(Drinker.SOCIALLY));
     ListField email = new ListFieldImpl("work",
-        "shindig-dev@incubator.apache.org");
+        "dev@shindig.apache.org");
     canonical.setEmails(Lists.newArrayList(email));
 
     canonical.setEthnicity("developer");
@@ -127,7 +127,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/trunk/php/README
URL: http://svn.apache.org/viewvc/shindig/trunk/php/README?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/php/README (original)
+++ shindig/trunk/php/README Thu May  6 14:07:02 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/trunk/php/docs/README.lighttpd
URL: http://svn.apache.org/viewvc/shindig/trunk/php/docs/README.lighttpd?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/php/docs/README.lighttpd (original)
+++ shindig/trunk/php/docs/README.lighttpd Thu May  6 14:07:02 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/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=941746&r1=941745&r2=941746&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Thu May  6 14:07:02 2010
@@ -1172,7 +1172,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>