Author: lindner
Date: Tue Jan 26 06:25:13 2010
New Revision: 903100
URL: http://svn.apache.org/viewvc?rev=903100&view=rev
Log:
SHINDIG-1270 | Shindig TLP prep
Added:
incubator/shindig/trunk/my-app/
incubator/shindig/trunk/my-app/pom.xml
incubator/shindig/trunk/php/pom.xml
Modified:
incubator/shindig/trunk/COMMITTERS
incubator/shindig/trunk/assembly/pom.xml
incubator/shindig/trunk/features/pom.xml
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/samples/pom.xml
incubator/shindig/trunk/java/server/pom.xml
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/pom.xml
Modified: incubator/shindig/trunk/COMMITTERS
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/COMMITTERS?rev=903100&r1=903099&r2=903100&view=diff
==============================================================================
--- incubator/shindig/trunk/COMMITTERS (original)
+++ incubator/shindig/trunk/COMMITTERS Tue Jan 26 06:25:13 2010
@@ -9,6 +9,7 @@
Blanket commit access:
+ lindner Paul Lindner lind...@apache.org PMC Chair
agektmr Eiji Kitamura agek...@apache.org PMC Member
brianm Brian McCallister bri...@apache.org PMC Member
Mentor
chabotc Chris Chabot chab...@apache.org PMC Member
@@ -18,9 +19,9 @@
etnu Kevin Brown e...@apache.org PMC Member
ieb Ian Boston i...@apache.org PMC Member
evan Evan Gilbert e...@apache.org PMC Member
+ jasvir Jasvir Nagra jas...@apache.org PMC Member
johnh John Hjelmstad jo...@apache.org PMC Member
jyang Jun Yang jy...@apache.org PMC Member
- lindner Paul Lindner lind...@apache.org PMC Member
sgala Santiago Gala sg...@hisitech.com Emeritus
Mentor
lryan Louis Ryan lr...@apache.org PMC Member
martint Martin Traverso mart...@apache.org PMC Member
@@ -33,4 +34,4 @@
sylvain Sylvain Wallez sylv...@apache.org Mentor
tomdz Thomas Dudziak to...@apache.org Mentor
upayavira Upayavira upayav...@apache.org Mentor
- dharkness David Harkness dharkn...@apache.org Emeritus
+ dharkness David Harkness dharkn...@apache.org Emeritus
\ No newline at end of file
Modified: incubator/shindig/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/assembly/pom.xml?rev=903100&r1=903099&r2=903100&view=diff
==============================================================================
--- incubator/shindig/trunk/assembly/pom.xml (original)
+++ incubator/shindig/trunk/assembly/pom.xml Tue Jan 26 06:25:13 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.1-BETA6-incubating-SNAPSHOT</version>
+ <version>1.1-BETA6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -33,11 +33,11 @@
<description>Assembles the Java/PHP code base into a deployment
package.</description>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/trunk/assembly
+ <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/assembly
</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/assembly
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/assembly
</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/shindig/trunk/assembly</url>
+ <url>http://svn.apache.org/viewvc/shindig/trunk/assembly</url>
</scm>
<build>
Modified: incubator/shindig/trunk/features/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/pom.xml?rev=903100&r1=903099&r2=903100&view=diff
==============================================================================
--- incubator/shindig/trunk/features/pom.xml (original)
+++ incubator/shindig/trunk/features/pom.xml Tue Jan 26 06:25:13 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.1-BETA6-incubating-SNAPSHOT</version>
+ <version>1.1-BETA6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=903100&r1=903099&r2=903100&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Tue Jan 26 06:25:13 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.1-BETA6-incubating-SNAPSHOT</version>
+ <version>1.1-BETA6-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/trunk/java/common</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/java/common</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/common</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/common</developerConnection>
+ <url>http://svn.apache.org/viewvc/shindig/trunk/java/common</url>
</scm>
<build>
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=903100&r1=903099&r2=903100&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Tue Jan 26 06:25:13 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.1-BETA6-incubating-SNAPSHOT</version>
+ <version>1.1-BETA6-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/trunk/java/gadgets</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/java/gadgets</developerConnection>
-
<url>http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/gadgets</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/gadgets</developerConnection>
+ <url>http://svn.apache.org/viewvc/shindig/trunk/java/gadgets</url>
</scm>
<build>
Modified: incubator/shindig/trunk/java/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/pom.xml?rev=903100&r1=903099&r2=903100&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/pom.xml (original)
+++ incubator/shindig/trunk/java/samples/pom.xml Tue Jan 26 06:25:13 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.1-BETA6-incubating-SNAPSHOT</version>
+ <version>1.1-BETA6-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/trunk/java/samples</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/java/samples</developerConnection>
-
<url>http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/samples</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/samples</developerConnection>
+ <url>http://svn.apache.org/viewvc/shindig/trunk/java/samples</url>
</scm>
<repositories>
Modified: incubator/shindig/trunk/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/pom.xml?rev=903100&r1=903099&r2=903100&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/pom.xml (original)
+++ incubator/shindig/trunk/java/server/pom.xml Tue Jan 26 06:25:13 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.1-BETA6-incubating-SNAPSHOT</version>
+ <version>1.1-BETA6-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/trunk/java/server</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/java/server</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/server</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/server</developerConnection>
+ <url>http://svn.apache.org/viewvc/shindig/trunk/java/server</url>
</scm>
<properties>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=903100&r1=903099&r2=903100&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Tue Jan 26 06:25:13 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.1-BETA6-incubating-SNAPSHOT</version>
+ <version>1.1-BETA6-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/trunk/java/social-api</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/java/social-api</developerConnection>
-
<url>http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/social-api</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/social-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/shindig/trunk/java/social-api</url>
</scm>
<build>
Added: incubator/shindig/trunk/my-app/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/my-app/pom.xml?rev=903100&view=auto
==============================================================================
--- incubator/shindig/trunk/my-app/pom.xml (added)
+++ incubator/shindig/trunk/my-app/pom.xml Tue Jan 26 06:25:13 2010
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.sample</groupId>
+ <artifactId>my-app</artifactId>
+ <packaging>php</packaging>
+ <name>Sample PHP 5 web project</name>
+ <version>1.0-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.phpmaven</groupId>
+ <artifactId>maven-php-plugin</artifactId>
+ <version>1.0</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.phpmaven</groupId>
+
<artifactId>maven-php-plugin</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>bundle-project-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>
+
php-webapp
+ </descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.phpunit</groupId>
+ <artifactId>phpunit5</artifactId>
+ <version>3.3.9</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.phpmaven</groupId>
+ <artifactId>maven-php-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+
<report>report-only</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Added: incubator/shindig/trunk/php/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/pom.xml?rev=903100&view=auto
==============================================================================
--- incubator/shindig/trunk/php/pom.xml (added)
+++ incubator/shindig/trunk/php/pom.xml Tue Jan 26 06:25:13 2010
@@ -0,0 +1,101 @@
+<?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.
+-->
+<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-project</artifactId>
+ <version>1.1-BETA6-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>shindig-php</artifactId>
+ <packaging>php</packaging>
+
+ <name>Shindig PHP version</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.phpmaven</groupId>
+ <artifactId>maven-php-plugin</artifactId>
+ <version>1.0</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.phpmaven</groupId>
+ <artifactId>maven-php-plugin</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>bundle-project-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>
+ php-webapp
+ </descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.phpunit</groupId>
+ <artifactId>phpunit5</artifactId>
+ <version>3.3.9</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.phpmaven</groupId>
+ <artifactId>maven-php-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>report-only</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=903100&r1=903099&r2=903100&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Tue Jan 26 06:25:13 2010
@@ -28,7 +28,7 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.1-BETA6-incubating-SNAPSHOT</version>
+ <version>1.1-BETA6-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/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/shindig/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/shindig/trunk</url>
</scm>
<!-- ======================================================================
-->
@@ -76,7 +76,7 @@
<!-- This is the technical website for Shindig 1.1.x -->
<site>
<id>apache.website</id>
-
<url>scp://people.apache.org/www/incubator.apache.org/shindig/shindig-1.1.x</url>
+ <url>scp://people.apache.org/www/shindig.apache.org/shindig-1.1.x</url>
</site>
</distributionManagement>
@@ -86,25 +86,31 @@
<mailingLists>
<mailingList>
<name>Shindig Dev List</name>
- <subscribe>shindig-dev-subscr...@incubator.apache.org</subscribe>
- <unsubscribe>shindig-dev-unsubscr...@incubator.apache.org</unsubscribe>
- <post>shindig-...@incubator.apache.org</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/incubator-shindig-dev/</archive>
+ <subscribe>dev-subscr...@shindig.apache.org</subscribe>
+ <unsubscribe>dev-unsubscr...@shindig.apache.org</unsubscribe>
+ <post>d...@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 User List</name>
+ <subscribe>user-subscr...@shindig.apache.org</subscribe>
+ <unsubscribe>user-unsubscr...@shindig.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/shindig-user/</archive>
+ </mailingList>
+ <mailingList>
<name>Shindig Commit List</name>
- <subscribe>shindig-commits-subscr...@incubator.apache.org</subscribe>
-
<unsubscribe>shindig-commits-unsubscr...@incubator.apache.org</unsubscribe>
-
<archive>http://mail-archives.apache.org/mod_mbox/incubator-shindig-commits/</archive>
+ <subscribe>commits-subscr...@shindig.apache.org</subscribe>
+ <unsubscribe>commits-unsubscr...@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-subscr...@incubator.apache.org</subscribe>
-
<unsubscribe>shindig-issues-unsubscr...@incubator.apache.org</unsubscribe>
-
<archive>http://mail-archives.apache.org/mod_mbox/incubator-shindig-issues/</archive>
+ <subscribe>issues-subscr...@shindig.apache.org</subscribe>
+ <unsubscribe>issues-unsubscr...@shindig.apache.org</unsubscribe>
+
<archive>http://mail-archives.apache.org/mod_mbox/shindig-issues/</archive>
</mailingList>
</mailingLists>
@@ -114,6 +120,15 @@
<!-- Developers listed by PMC Chair, PMC, Mentors, Committers, Contributers,
all alphabetical-->
<developers>
<!-- PMC Chair -->
+ <developer>
+ <id>lindner</id>
+ <name>Paul Lindner</name>
+ <email>lind...@apache.org</email>
+ <organization>ASF</organization>
+ <roles>
+ <role>PMC Chair</role>
+ </roles>
+ </developer>
<!-- PMC -->
<developer>
<id>agektmr</id>
@@ -225,15 +240,6 @@
</roles>
</developer>
<developer>
- <id>lindner</id>
- <name>Paul Lindner</name>
- <email>lind...@apache.org</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- </developer>
- <developer>
<id>sgala</id>
<name>Santiago Gala</name>
<email>sg...@hisitech.com</email>
@@ -523,7 +529,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.1.x/${pom.version}</stagingSiteURL>
+
<stagingSiteURL>scp://people.apache.org/www/shindig.apache.org/shindig-1.1.x/${pom.version}</stagingSiteURL>
</configuration>
</plugin>
<plugin>
@@ -541,8 +547,8 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.3</version>
<configuration>
-
<configLocation>http://svn.apache.org/repos/asf/incubator/shindig/trunk/etc/checkstyle/checkstyle.xml</configLocation>
-
<headerLocation>http://svn.apache.org/repos/asf/incubator/shindig/trunk/etc/checkstyle/java.header</headerLocation>
+
<configLocation>http://svn.apache.org/repos/asf/shindig/trunk/etc/checkstyle/checkstyle.xml</configLocation>
+
<headerLocation>http://svn.apache.org/repos/asf/shindig/trunk/etc/checkstyle/java.header</headerLocation>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
