You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/10/07 03:01:31 UTC
svn commit: r702319 - in /incubator/shindig/trunk/features: ./
opensocial-base/ opensocial-current/ opensocial-jsonrpc/ opensocial-rest/
Author: etnu
Date: Mon Oct 6 18:01:30 2008
New Revision: 702319
URL: http://svn.apache.org/viewvc?rev=702319&view=rev
Log:
Moving json and rest implementations into separate features so that anyone doing a custom opensocial-0.8 implementation can avoid repeated dependencies. To override with custom functionality, the following is all that's needed now:
<name>opensocial-0.8</name>
<dependency>opensocial-jsonrpc</dependency>
<gadget>
<script src="custom-override.js"/>
</gadget>
Added:
incubator/shindig/trunk/features/opensocial-base/
incubator/shindig/trunk/features/opensocial-base/feature.xml
incubator/shindig/trunk/features/opensocial-base/fieldtranslations.js
- copied unchanged from r702303, incubator/shindig/trunk/features/opensocial-current/fieldtranslations.js
incubator/shindig/trunk/features/opensocial-base/jsonactivity.js
- copied unchanged from r702303, incubator/shindig/trunk/features/opensocial-current/jsonactivity.js
incubator/shindig/trunk/features/opensocial-base/jsonactivitytest.js
- copied unchanged from r702303, incubator/shindig/trunk/features/opensocial-current/jsonactivitytest.js
incubator/shindig/trunk/features/opensocial-base/jsonperson.js
- copied unchanged from r702303, incubator/shindig/trunk/features/opensocial-current/jsonperson.js
incubator/shindig/trunk/features/opensocial-jsonrpc/
incubator/shindig/trunk/features/opensocial-jsonrpc/feature.xml
incubator/shindig/trunk/features/opensocial-jsonrpc/jsonrpccontainer.js
- copied unchanged from r702303, incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
incubator/shindig/trunk/features/opensocial-rest/
incubator/shindig/trunk/features/opensocial-rest/feature.xml
incubator/shindig/trunk/features/opensocial-rest/restfulcontainer.js
- copied unchanged from r702303, incubator/shindig/trunk/features/opensocial-current/restfulcontainer.js
Removed:
incubator/shindig/trunk/features/opensocial-current/fieldtranslations.js
incubator/shindig/trunk/features/opensocial-current/jsonactivity.js
incubator/shindig/trunk/features/opensocial-current/jsonactivitytest.js
incubator/shindig/trunk/features/opensocial-current/jsonperson.js
incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
incubator/shindig/trunk/features/opensocial-current/restfulcontainer.js
Modified:
incubator/shindig/trunk/features/features.txt
incubator/shindig/trunk/features/opensocial-current/feature.xml
incubator/shindig/trunk/features/pom.xml
Modified: incubator/shindig/trunk/features/features.txt
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/features.txt?rev=702319&r1=702318&r2=702319&view=diff
==============================================================================
--- incubator/shindig/trunk/features/features.txt (original)
+++ incubator/shindig/trunk/features/features.txt Mon Oct 6 18:01:30 2008
@@ -10,8 +10,11 @@
features/minimessage/feature.xml
features/opensocial-0.6/feature.xml
features/opensocial-0.7/feature.xml
+features/opensocial-base/feature.xml
features/opensocial-current/feature.xml
+features/opensocial-jsonrpc/feature.xml
features/opensocial-reference/feature.xml
+features/opensocial-rest/feature.xml
features/opensocial-templates/feature.xml
features/rpc/feature.xml
features/setprefs/feature.xml
Added: incubator/shindig/trunk/features/opensocial-base/feature.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-base/feature.xml?rev=702319&view=auto
==============================================================================
--- incubator/shindig/trunk/features/opensocial-base/feature.xml (added)
+++ incubator/shindig/trunk/features/opensocial-base/feature.xml Mon Oct 6 18:01:30 2008
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<feature>
+ <name>opensocial-base</name>
+ <dependency>opensocial-reference</dependency>
+ <gadget>
+ <script src="fieldtranslations.js"></script>
+ <script src="jsonactivity.js"></script>
+ <script src="jsonperson.js"></script>
+ </gadget>
+</feature>
Modified: incubator/shindig/trunk/features/opensocial-current/feature.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-current/feature.xml?rev=702319&r1=702318&r2=702319&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-current/feature.xml (original)
+++ incubator/shindig/trunk/features/opensocial-current/feature.xml Mon Oct 6 18:01:30 2008
@@ -19,16 +19,12 @@
-->
<feature>
<name>opensocial-0.8</name>
- <dependency>opensocial-reference</dependency>
+ <dependency>opensocial-jsonrpc</dependency>
+ <dependency>opensocial-rest</dependency>
<!-- <dependency>caja</dependency> -->
<!-- Must include the "caja" feature to display samplecontainer -->
<!-- gadgets when "use caja" is checked -->
- <gadget>
- <script src="fieldtranslations.js"></script>
- <script src="jsonactivity.js"></script>
- <script src="jsonperson.js"></script>
- <script src="restfulcontainer.js"></script>
- <script src="jsonrpccontainer.js"></script>
+ <gadget>
<script>
var requiredConfig = {
"impl": gadgets.config.NonEmptyStringValidator,
@@ -64,7 +60,6 @@
opensocial.Container.get().enableCaja();
}
});
-
</script>
</gadget>
</feature>
Added: incubator/shindig/trunk/features/opensocial-jsonrpc/feature.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-jsonrpc/feature.xml?rev=702319&view=auto
==============================================================================
--- incubator/shindig/trunk/features/opensocial-jsonrpc/feature.xml (added)
+++ incubator/shindig/trunk/features/opensocial-jsonrpc/feature.xml Mon Oct 6 18:01:30 2008
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<feature>
+ <name>opensocial-jsonrpc</name>
+ <dependency>opensocial-base</dependency>
+ <gadget>
+ <script src="jsonrpccontainer.js"></script>
+ </gadget>
+</feature>
Added: incubator/shindig/trunk/features/opensocial-rest/feature.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-rest/feature.xml?rev=702319&view=auto
==============================================================================
--- incubator/shindig/trunk/features/opensocial-rest/feature.xml (added)
+++ incubator/shindig/trunk/features/opensocial-rest/feature.xml Mon Oct 6 18:01:30 2008
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<feature>
+ <name>opensocial-rest</name>
+ <dependency>opensocial-base</dependency>
+ <gadget>
+ <script src="restfulcontainer.js"></script>
+ </gadget>
+</feature>
Modified: incubator/shindig/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/pom.xml?rev=702319&r1=702318&r2=702319&view=diff
==============================================================================
--- incubator/shindig/trunk/features/pom.xml (original)
+++ incubator/shindig/trunk/features/pom.xml Mon Oct 6 18:01:30 2008
@@ -120,10 +120,10 @@
<source>opensocial-reference/phone.js</source>
<source>opensocial-reference/responseitem.js</source>
<source>opensocial-reference/url.js</source>
- <source>opensocial-current/jsonactivity.js</source>
- <source>opensocial-current/jsonperson.js</source>
- <source>opensocial-current/restfulcontainer.js</source>
- <source>opensocial-current/jsonrpccontainer.js</source>
+ <source>opensocial-base/jsonactivity.js</source>
+ <source>opensocial-base/jsonperson.js</source>
+ <source>opensocial-rest/restfulcontainer.js</source>
+ <source>opensocial-jsonrpc/jsonrpccontainer.js</source>
</sources>
<testSourceDirectory>${basedir}</testSourceDirectory>
<testSuites>
@@ -141,7 +141,7 @@
<type>TESTCASES</type>
<includes>
<include>opensocial-reference/*test.js</include>
- <include>opensocial-current/*test.js</include>
+ <include>opensocial-base/*test.js</include>
</includes>
</testSuite>
</testSuites>