You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by vs...@apache.org on 2009/04/13 14:42:06 UTC
svn commit: r764427 - in
/incubator/shindig/branches/1.0.x-incubating/features: ./ analytics/
auth-refresh/ caja/ core.io/ core/ dynamic-height/ flash/ locked-domain/
minimessage/ mocks/ opensocial-0.6/ opensocial-0.7/ opensocial-base/
opensocial-curre...
Author: vsiveton
Date: Mon Apr 13 12:42:04 2009
New Revision: 764427
URL: http://svn.apache.org/viewvc?rev=764427&view=rev
Log:
o merged r747288 (SHINDIG-806), r764416, r764426
Added:
incubator/shindig/branches/1.0.x-incubating/features/src/
incubator/shindig/branches/1.0.x-incubating/features/src/main/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/analytics/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/analytics/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/auth-refresh/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/auth-refresh/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/caja/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/caja/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/core/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/core/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/core.io/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/core.io/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/dynamic-height/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/dynamic-height/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/features.txt
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/features.txt
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/flash/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/flash/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/locked-domain/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/locked-domain/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/minimessage/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/minimessage/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-0.6/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.6/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-0.7/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.7/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-base/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-base/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-current/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-current/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-jsonrpc/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-jsonrpc/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-reference/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-reference/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-rest/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-rest/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-templates/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-templates/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/pubsub/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/pubsub/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/rpc/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/rpc/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/setprefs/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/setprefs/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/settitle/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/settitle/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/skins/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/skins/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/tabs/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/tabs/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/views/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/views/
incubator/shindig/branches/1.0.x-incubating/features/src/test/
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/core/
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/core.io/
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/core.io/iotest.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/core.io/iotest.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/core/authtest.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/core/authtest.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/core/prefstest.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/core/prefstest.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/core/utiltest.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/core/utiltest.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/mocks/
- copied from r764426, incubator/shindig/branches/1.0.x-incubating/features/mocks/
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-base/
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-base/jsonactivitytest.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-base/jsonactivitytest.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-reference/
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-reference/activitytest.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-reference/activitytest.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-templates/
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-templates/compiler_test.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-templates/compiler_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-templates/container_test.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-templates/container_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-templates/data_test.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-templates/data_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-templates/loader_test.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-templates/loader_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-templates/os_test.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-templates/os_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-templates/template_test.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-templates/template_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/opensocial-templates/util_test.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/opensocial-templates/util_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/views/
incubator/shindig/branches/1.0.x-incubating/features/src/test/javascript/features/views/urltemplatetest.js
- copied unchanged from r764426, incubator/shindig/branches/1.0.x-incubating/features/views/urltemplatetest.js
Removed:
incubator/shindig/branches/1.0.x-incubating/features/analytics/
incubator/shindig/branches/1.0.x-incubating/features/auth-refresh/
incubator/shindig/branches/1.0.x-incubating/features/caja/
incubator/shindig/branches/1.0.x-incubating/features/core/
incubator/shindig/branches/1.0.x-incubating/features/core.io/
incubator/shindig/branches/1.0.x-incubating/features/dynamic-height/
incubator/shindig/branches/1.0.x-incubating/features/features.txt
incubator/shindig/branches/1.0.x-incubating/features/flash/
incubator/shindig/branches/1.0.x-incubating/features/locked-domain/
incubator/shindig/branches/1.0.x-incubating/features/minimessage/
incubator/shindig/branches/1.0.x-incubating/features/mocks/
incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.6/
incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.7/
incubator/shindig/branches/1.0.x-incubating/features/opensocial-base/
incubator/shindig/branches/1.0.x-incubating/features/opensocial-current/
incubator/shindig/branches/1.0.x-incubating/features/opensocial-jsonrpc/
incubator/shindig/branches/1.0.x-incubating/features/opensocial-reference/
incubator/shindig/branches/1.0.x-incubating/features/opensocial-rest/
incubator/shindig/branches/1.0.x-incubating/features/opensocial-templates/
incubator/shindig/branches/1.0.x-incubating/features/pubsub/
incubator/shindig/branches/1.0.x-incubating/features/rpc/
incubator/shindig/branches/1.0.x-incubating/features/setprefs/
incubator/shindig/branches/1.0.x-incubating/features/settitle/
incubator/shindig/branches/1.0.x-incubating/features/skins/
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/core.io/iotest.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/core/authtest.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/core/prefstest.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/core/utiltest.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-base/jsonactivitytest.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-reference/activitytest.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-templates/compiler_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-templates/container_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-templates/data_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-templates/loader_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-templates/os_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-templates/template_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/opensocial-templates/util_test.js
incubator/shindig/branches/1.0.x-incubating/features/src/main/javascript/features/views/urltemplatetest.js
incubator/shindig/branches/1.0.x-incubating/features/tabs/
incubator/shindig/branches/1.0.x-incubating/features/views/
Modified:
incubator/shindig/branches/1.0.x-incubating/features/pom.xml
Modified: incubator/shindig/branches/1.0.x-incubating/features/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/features/pom.xml?rev=764427&r1=764426&r2=764427&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/features/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/features/pom.xml Mon Apr 13 12:42:04 2009
@@ -41,6 +41,19 @@
</scm>
<build>
+ <resources>
+ <resource>
+ <targetPath>features</targetPath>
+ <directory>${basedir}/src/main/javascript/features</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <targetPath>features</targetPath>
+ <directory>${basedir}/src/test/javascript/features</directory>
+ </testResource>
+ </testResources>
+
<pluginManagement>
<!-- set versions of common plugins for reproducibility, ordered alphabetically by owner -->
<plugins>
@@ -66,10 +79,10 @@
<executions>
<execution>
<configuration>
- <sourceDirectory>${basedir}</sourceDirectory>
+ <sourceDirectory>${basedir}/src/main/javascript/features</sourceDirectory>
<sources>
- <source>mocks/env.js</source>
- <source>mocks/xhr.js</source>
+ <source>../../../../src/test/javascript/features/mocks/env.js</source>
+ <source>../../../../src/test/javascript/features/mocks/xhr.js</source>
<source>core/config.js</source>
<source>core/json.js</source>
<source>core/auth.js</source>
@@ -103,23 +116,14 @@
<source>opensocial-rest/restfulcontainer.js</source>
<source>opensocial-jsonrpc/jsonrpccontainer.js</source>
</sources>
- <testSourceDirectory>${basedir}</testSourceDirectory>
+ <testSourceDirectory>${basedir}/src/test/javascript/features</testSourceDirectory>
<testSuites>
<testSuite>
- <name>GadgetsJSAPITests</name>
+ <name>FeatureTests</name>
<type>TESTCASES</type>
<includes>
- <include>core/*test.js</include>
- <include>core.io/*test.js</include>
- <include>views/*test.js</include>
- </includes>
- </testSuite>
- <testSuite>
- <name>OpenSocialJsTests</name>
- <type>TESTCASES</type>
- <includes>
- <include>opensocial-reference/*test.js</include>
- <include>opensocial-base/*test.js</include>
+ <include>mocks/*.js</include>
+ <include>**/*test.js</include>
</includes>
</testSuite>
</testSuites>
@@ -160,13 +164,7 @@
<configuration>
<suffix>.opt</suffix>
<excludes>
- <exclude>target/**</exclude>
- <!-- don't bother with other file types. -->
<exclude>**/*.xml</exclude>
- <exclude>**/*.html</exclude>
- <exclude>**/*.gif</exclude>
- <exclude>**/*.jpeg</exclude>
- <exclude>**/*.png</exclude>
<!-- Caja is already minified -->
<exclude>**/caja/*.js</exclude>
</excludes>
@@ -175,35 +173,6 @@
</configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <targetPath>features</targetPath>
- <directory>${basedir}</directory>
- <excludes>
- <exclude>pom.xml</exclude>
- <!-- SVN ignore -->
- <exclude>target/**</exclude>
- <exclude>work</exclude>
- <exclude>dojo</exclude>
- <exclude>*.iws</exclude>
- <exclude>*.ipr</exclude>
- <exclude>*.iml</exclude>
- <exclude>derby.log</exclude>
- <exclude>maven.log</exclude>
- <exclude>build.xml</exclude>
- <exclude>build-dependency.xml</exclude>
- <exclude>velocity.log*</exclude>
- <exclude>junit*.properties</exclude>
- <exclude>surefire*.properties</exclude>
- <exclude>.project</exclude>
- <exclude>.classpath</exclude>
- <exclude>.settings/**</exclude>
- <exclude>.deployables</exclude>
- <exclude>.wtpmodules</exclude>
- <exclude>.externalToolBuilders/**</exclude>
- </excludes>
- </resource>
- </resources>
</build>
<dependencies />