Author: awiner
Date: Tue Jun 16 20:17:14 2009
New Revision: 785368
URL: http://svn.apache.org/viewvc?rev=785368&view=rev
Log:
Move OSML library out of Java tree
Added:
incubator/shindig/trunk/config/OSML_library.xml (props changed)
- copied unchanged from r784225,
incubator/shindig/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/templates/OSML_library.xml
Removed:
incubator/shindig/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/templates/OSML_library.xml
Modified:
incubator/shindig/trunk/config/container.js
incubator/shindig/trunk/java/gadgets/pom.xml
Propchange: incubator/shindig/trunk/config/OSML_library.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/shindig/trunk/config/container.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/config/container.js?rev=785368&r1=785367&r2=785368&view=diff
==============================================================================
--- incubator/shindig/trunk/config/container.js (original)
+++ incubator/shindig/trunk/config/container.js Tue Jun 16 20:17:14 2009
@@ -161,6 +161,6 @@
"osml": {
// OSML library resource. Can be set to null or the empty string to
disable OSML
// for a container.
- "library": "org/apache/shindig/gadgets/templates/OSML_library.xml"
+ "library": "config/OSML_library.xml"
}
}}
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=785368&r1=785367&r2=785368&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Tue Jun 16 20:17:14 2009
@@ -79,6 +79,7 @@
<directory>${basedir}/../../config</directory>
<includes>
<include>oauth.json</include>
+ <include>OSML_library.xml</include>
</includes>
</resource>
