Author: lindner
Date: Wed Sep 23 22:20:22 2009
New Revision: 818286
URL: http://svn.apache.org/viewvc?rev=818286&view=rev
Log:
simplify module structure
Removed:
incubator/shindig/trunk/java/pom.xml
Modified:
incubator/shindig/trunk/assembly/pom.xml
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
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/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/assembly/pom.xml?rev=818286&r1=818285&r2=818286&view=diff
==============================================================================
--- incubator/shindig/trunk/assembly/pom.xml (original)
+++ incubator/shindig/trunk/assembly/pom.xml Wed Sep 23 22:20:22 2009
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shindig</groupId>
- <artifactId>shindig-parent</artifactId>
+ <artifactId>shindig-project</artifactId>
<version>1.1-BETA3-incubating-SNAPSHOT</version>
- <relativePath>../java/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>shindig</artifactId>
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=818286&r1=818285&r2=818286&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Wed Sep 23 22:20:22 2009
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shindig</groupId>
- <artifactId>shindig-parent</artifactId>
+ <artifactId>shindig-project</artifactId>
<version>1.1-BETA3-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>shindig-common</artifactId>
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java?rev=818286&r1=818285&r2=818286&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
Wed Sep 23 22:20:22 2009
@@ -204,8 +204,9 @@
* @throws ContainerConfigException
*/
private void loadFiles(File[] files, JSONObject all) throws
ContainerConfigException {
- try {
- for (File file : files) {
+ for (File file : files) {
+ try {
+ if (file == null) continue;
LOG.info("Reading container config: " + file.getName());
if (file.isDirectory()) {
loadFiles(file.listFiles(), all);
@@ -220,9 +221,9 @@
if (LOG.isLoggable(Level.FINEST))
LOG.finest(file.getAbsolutePath() + " doesn't seem to be a JS or
JSON file.");
}
+ } catch (IOException e) {
+ throw new ContainerConfigException("The file '" +
file.getAbsolutePath() + "' has errors", e);
}
- } catch (IOException e) {
- throw new ContainerConfigException(e);
}
}
@@ -236,6 +237,8 @@
for (String entry : files) {
LOG.info("Reading container config: " + entry);
String content = ResourceLoader.getContent(entry);
+ if (content == null || content.length() == 0)
+ throw new IOException("The file " + entry + "is empty");
loadFromString(content, all);
}
} catch (IOException e) {
@@ -322,7 +325,8 @@
all.put(container, contents);
}
} catch (JSONException e) {
- throw new ContainerConfigException(e);
+System.out.println("Trouble parsing " + json);
+ throw new ContainerConfigException("Trouble parsing " + json, e);
}
}
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=818286&r1=818285&r2=818286&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Wed Sep 23 22:20:22 2009
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shindig</groupId>
- <artifactId>shindig-parent</artifactId>
+ <artifactId>shindig-project</artifactId>
<version>1.1-BETA3-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>shindig-gadgets</artifactId>
Modified: incubator/shindig/trunk/java/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/pom.xml?rev=818286&r1=818285&r2=818286&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/pom.xml (original)
+++ incubator/shindig/trunk/java/samples/pom.xml Wed Sep 23 22:20:22 2009
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shindig</groupId>
- <artifactId>shindig-parent</artifactId>
+ <artifactId>shindig-project</artifactId>
<version>1.1-BETA3-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>shindig-samples</artifactId>
Modified: incubator/shindig/trunk/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/pom.xml?rev=818286&r1=818285&r2=818286&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/pom.xml (original)
+++ incubator/shindig/trunk/java/server/pom.xml Wed Sep 23 22:20:22 2009
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shindig</groupId>
- <artifactId>shindig-parent</artifactId>
+ <artifactId>shindig-project</artifactId>
<version>1.1-BETA3-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>shindig-server</artifactId>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=818286&r1=818285&r2=818286&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Wed Sep 23 22:20:22 2009
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shindig</groupId>
- <artifactId>shindig-parent</artifactId>
+ <artifactId>shindig-project</artifactId>
<version>1.1-BETA3-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>shindig-social-api</artifactId>
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=818286&r1=818285&r2=818286&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Wed Sep 23 22:20:22 2009
@@ -356,7 +356,11 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>java</module>
+ <module>features</module>
+ <module>java/common</module>
+ <module>java/gadgets</module>
+ <module>java/social-api</module>
+ <module>java/server</module>
</modules>
</profile>
@@ -458,7 +462,12 @@
<profile>
<id>reporting</id>
<modules>
- <module>java</module>
+ <module>features</module>
+ <module>java/common</module>
+ <module>java/gadgets</module>
+ <module>java/social-api</module>
+ <module>java/server</module>
+ <module>java/samples</module>
</modules>
<build>
<plugins>
@@ -730,10 +739,16 @@
</reporting>
</profile>
+ <!-- Apache Release Profile -->
+
<profile>
<id>apache-release</id>
<modules>
- <module>java</module>
+ <module>features</module>
+ <module>java/common</module>
+ <module>java/gadgets</module>
+ <module>java/social-api</module>
+ <module>java/server</module>
<module>java/samples</module>
<module>assembly</module>
</modules>
@@ -813,7 +828,11 @@
</plugins>
</build>
<modules>
- <module>java</module>
+ <module>features</module>
+ <module>java/common</module>
+ <module>java/gadgets</module>
+ <module>java/social-api</module>
+ <module>java/server</module>
<module>assembly</module>
</modules>
</profile>
