Branching 2.5.0-update1

git-svn-id: https://svn.apache.org/repos/asf/shindig/branches/2.5.0-update1@1513695 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/trunk/.gitignore b/.gitignore
similarity index 100%
rename from trunk/.gitignore
rename to .gitignore
diff --git a/trunk/.reviewboardrc b/.reviewboardrc
similarity index 100%
rename from trunk/.reviewboardrc
rename to .reviewboardrc
diff --git a/trunk/BUILD-JAVA b/BUILD-JAVA
similarity index 100%
rename from trunk/BUILD-JAVA
rename to BUILD-JAVA
diff --git a/trunk/COMMITTERS b/COMMITTERS
similarity index 100%
rename from trunk/COMMITTERS
rename to COMMITTERS
diff --git a/trunk/KEYS b/KEYS
similarity index 100%
rename from trunk/KEYS
rename to KEYS
diff --git a/trunk/LICENSE b/LICENSE
similarity index 100%
rename from trunk/LICENSE
rename to LICENSE
diff --git a/trunk/NOTICE b/NOTICE
similarity index 100%
rename from trunk/NOTICE
rename to NOTICE
diff --git a/trunk/README b/README
similarity index 100%
rename from trunk/README
rename to README
diff --git a/trunk/UPGRADING b/UPGRADING
similarity index 100%
rename from trunk/UPGRADING
rename to UPGRADING
diff --git a/trunk/assembly/pom.xml b/assembly/pom.xml
similarity index 100%
rename from trunk/assembly/pom.xml
rename to assembly/pom.xml
diff --git a/trunk/assembly/src/main/assembly/binary-src/README b/assembly/src/main/assembly/binary-src/README
similarity index 100%
rename from trunk/assembly/src/main/assembly/binary-src/README
rename to assembly/src/main/assembly/binary-src/README
diff --git a/trunk/assembly/src/main/assembly/java.xml b/assembly/src/main/assembly/java.xml
similarity index 100%
rename from trunk/assembly/src/main/assembly/java.xml
rename to assembly/src/main/assembly/java.xml
diff --git a/trunk/assembly/src/main/assembly/php.xml b/assembly/src/main/assembly/php.xml
similarity index 100%
rename from trunk/assembly/src/main/assembly/php.xml
rename to assembly/src/main/assembly/php.xml
diff --git a/trunk/assembly/src/main/assembly/source.xml b/assembly/src/main/assembly/source.xml
similarity index 100%
rename from trunk/assembly/src/main/assembly/source.xml
rename to assembly/src/main/assembly/source.xml
diff --git a/trunk/config/OSML_library.xml b/config/OSML_library.xml
similarity index 100%
rename from trunk/config/OSML_library.xml
rename to config/OSML_library.xml
diff --git a/trunk/config/container.js b/config/container.js
similarity index 100%
rename from trunk/config/container.js
rename to config/container.js
diff --git a/trunk/config/gadget-admin.json b/config/gadget-admin.json
similarity index 100%
rename from trunk/config/gadget-admin.json
rename to config/gadget-admin.json
diff --git a/trunk/config/oauth.json b/config/oauth.json
similarity index 100%
rename from trunk/config/oauth.json
rename to config/oauth.json
diff --git a/trunk/config/oauth2.json b/config/oauth2.json
similarity index 100%
rename from trunk/config/oauth2.json
rename to config/oauth2.json
diff --git a/trunk/content/README b/content/README
similarity index 100%
rename from trunk/content/README
rename to content/README
diff --git a/trunk/content/containers/commoncontainer/assembler.js b/content/containers/commoncontainer/assembler.js
similarity index 100%
rename from trunk/content/containers/commoncontainer/assembler.js
rename to content/containers/commoncontainer/assembler.js
diff --git a/trunk/content/containers/commoncontainer/cconviews.js b/content/containers/commoncontainer/cconviews.js
similarity index 100%
rename from trunk/content/containers/commoncontainer/cconviews.js
rename to content/containers/commoncontainer/cconviews.js
diff --git a/trunk/content/containers/commoncontainer/gadgetCollections.json b/content/containers/commoncontainer/gadgetCollections.json
similarity index 100%
rename from trunk/content/containers/commoncontainer/gadgetCollections.json
rename to content/containers/commoncontainer/gadgetCollections.json
diff --git a/trunk/content/containers/commoncontainer/index.html b/content/containers/commoncontainer/index.html
similarity index 100%
rename from trunk/content/containers/commoncontainer/index.html
rename to content/containers/commoncontainer/index.html
diff --git a/trunk/content/containers/commoncontainer/layout.js b/content/containers/commoncontainer/layout.js
similarity index 100%
rename from trunk/content/containers/commoncontainer/layout.js
rename to content/containers/commoncontainer/layout.js
diff --git a/trunk/content/containers/commoncontainer/pubsub2.json b/content/containers/commoncontainer/pubsub2.json
similarity index 100%
rename from trunk/content/containers/commoncontainer/pubsub2.json
rename to content/containers/commoncontainer/pubsub2.json
diff --git a/trunk/content/containers/commoncontainer/sample-views.xml b/content/containers/commoncontainer/sample-views.xml
similarity index 100%
rename from trunk/content/containers/commoncontainer/sample-views.xml
rename to content/containers/commoncontainer/sample-views.xml
diff --git a/trunk/content/containers/commoncontainer/search.js b/content/containers/commoncontainer/search.js
similarity index 100%
rename from trunk/content/containers/commoncontainer/search.js
rename to content/containers/commoncontainer/search.js
diff --git a/trunk/content/containers/commoncontainer/viewController.js b/content/containers/commoncontainer/viewController.js
similarity index 100%
rename from trunk/content/containers/commoncontainer/viewController.js
rename to content/containers/commoncontainer/viewController.js
diff --git a/trunk/content/containers/commoncontainer/viewsMenu.json b/content/containers/commoncontainer/viewsMenu.json
similarity index 100%
rename from trunk/content/containers/commoncontainer/viewsMenu.json
rename to content/containers/commoncontainer/viewsMenu.json
diff --git a/trunk/content/containers/conservcontainer/ConServContainer.js b/content/containers/conservcontainer/ConServContainer.js
similarity index 100%
rename from trunk/content/containers/conservcontainer/ConServContainer.js
rename to content/containers/conservcontainer/ConServContainer.js
diff --git a/trunk/content/containers/conservcontainer/index.html b/content/containers/conservcontainer/index.html
similarity index 100%
rename from trunk/content/containers/conservcontainer/index.html
rename to content/containers/conservcontainer/index.html
diff --git a/trunk/content/containers/conservcontainer/layout.js b/content/containers/conservcontainer/layout.js
similarity index 100%
rename from trunk/content/containers/conservcontainer/layout.js
rename to content/containers/conservcontainer/layout.js
diff --git a/trunk/content/containers/conservcontainer/portlet.css b/content/containers/conservcontainer/portlet.css
similarity index 100%
rename from trunk/content/containers/conservcontainer/portlet.css
rename to content/containers/conservcontainer/portlet.css
diff --git a/trunk/content/containers/conservcontainer/sample-actions-runner.xml b/content/containers/conservcontainer/sample-actions-runner.xml
similarity index 100%
rename from trunk/content/containers/conservcontainer/sample-actions-runner.xml
rename to content/containers/conservcontainer/sample-actions-runner.xml
diff --git a/trunk/content/containers/conservcontainer/sample-actions-voip.xml b/content/containers/conservcontainer/sample-actions-voip.xml
similarity index 100%
rename from trunk/content/containers/conservcontainer/sample-actions-voip.xml
rename to content/containers/conservcontainer/sample-actions-voip.xml
diff --git a/trunk/content/containers/conservcontainer/sample-selection-changer.xml b/content/containers/conservcontainer/sample-selection-changer.xml
similarity index 100%
rename from trunk/content/containers/conservcontainer/sample-selection-changer.xml
rename to content/containers/conservcontainer/sample-selection-changer.xml
diff --git a/trunk/content/containers/conservcontainer/sample-selection-listener.xml b/content/containers/conservcontainer/sample-selection-listener.xml
similarity index 100%
rename from trunk/content/containers/conservcontainer/sample-selection-listener.xml
rename to content/containers/conservcontainer/sample-selection-listener.xml
diff --git a/trunk/content/containers/conservcontainer/sample-selection-query.xml b/content/containers/conservcontainer/sample-selection-query.xml
similarity index 100%
rename from trunk/content/containers/conservcontainer/sample-selection-query.xml
rename to content/containers/conservcontainer/sample-selection-query.xml
diff --git a/trunk/content/containers/conservcontainer/viewController.js b/content/containers/conservcontainer/viewController.js
similarity index 100%
rename from trunk/content/containers/conservcontainer/viewController.js
rename to content/containers/conservcontainer/viewController.js
diff --git a/trunk/content/containers/deprecated/container/Bridge.as b/content/containers/deprecated/container/Bridge.as
similarity index 100%
rename from trunk/content/containers/deprecated/container/Bridge.as
rename to content/containers/deprecated/container/Bridge.as
diff --git a/trunk/content/containers/deprecated/container/Bridge.fla b/content/containers/deprecated/container/Bridge.fla
similarity index 100%
rename from trunk/content/containers/deprecated/container/Bridge.fla
rename to content/containers/deprecated/container/Bridge.fla
Binary files differ
diff --git a/trunk/content/containers/deprecated/container/Bridge.swf b/content/containers/deprecated/container/Bridge.swf
similarity index 100%
rename from trunk/content/containers/deprecated/container/Bridge.swf
rename to content/containers/deprecated/container/Bridge.swf
Binary files differ
diff --git a/trunk/content/containers/deprecated/container/cookiebaseduserprefstore.js b/content/containers/deprecated/container/cookiebaseduserprefstore.js
similarity index 100%
rename from trunk/content/containers/deprecated/container/cookiebaseduserprefstore.js
rename to content/containers/deprecated/container/cookiebaseduserprefstore.js
diff --git a/trunk/content/containers/deprecated/container/datauri_proxy.html b/content/containers/deprecated/container/datauri_proxy.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/datauri_proxy.html
rename to content/containers/deprecated/container/datauri_proxy.html
diff --git a/trunk/content/containers/deprecated/container/gadgets.css b/content/containers/deprecated/container/gadgets.css
similarity index 100%
rename from trunk/content/containers/deprecated/container/gadgets.css
rename to content/containers/deprecated/container/gadgets.css
diff --git a/trunk/content/containers/deprecated/container/payment-processor.html b/content/containers/deprecated/container/payment-processor.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/payment-processor.html
rename to content/containers/deprecated/container/payment-processor.html
diff --git a/trunk/content/containers/deprecated/container/payment-records-processor.html b/content/containers/deprecated/container/payment-records-processor.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/payment-records-processor.html
rename to content/containers/deprecated/container/payment-records-processor.html
diff --git a/trunk/content/containers/deprecated/container/rpc_relay.html b/content/containers/deprecated/container/rpc_relay.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/rpc_relay.html
rename to content/containers/deprecated/container/rpc_relay.html
diff --git a/trunk/content/containers/deprecated/container/rpc_relay.uncompressed.html b/content/containers/deprecated/container/rpc_relay.uncompressed.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/rpc_relay.uncompressed.html
rename to content/containers/deprecated/container/rpc_relay.uncompressed.html
diff --git a/trunk/content/containers/deprecated/container/rpctest_childgadget.xml b/content/containers/deprecated/container/rpctest_childgadget.xml
similarity index 100%
rename from trunk/content/containers/deprecated/container/rpctest_childgadget.xml
rename to content/containers/deprecated/container/rpctest_childgadget.xml
diff --git a/trunk/content/containers/deprecated/container/rpctest_container.html b/content/containers/deprecated/container/rpctest_container.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/rpctest_container.html
rename to content/containers/deprecated/container/rpctest_container.html
diff --git a/trunk/content/containers/deprecated/container/rpctest_gadget.xml b/content/containers/deprecated/container/rpctest_gadget.xml
similarity index 100%
rename from trunk/content/containers/deprecated/container/rpctest_gadget.xml
rename to content/containers/deprecated/container/rpctest_gadget.xml
diff --git a/trunk/content/containers/deprecated/container/rpctest_perf.js b/content/containers/deprecated/container/rpctest_perf.js
similarity index 100%
rename from trunk/content/containers/deprecated/container/rpctest_perf.js
rename to content/containers/deprecated/container/rpctest_perf.js
diff --git a/trunk/content/containers/deprecated/container/sample-metadata.html b/content/containers/deprecated/container/sample-metadata.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample-metadata.html
rename to content/containers/deprecated/container/sample-metadata.html
diff --git a/trunk/content/containers/deprecated/container/sample-payment-container.html b/content/containers/deprecated/container/sample-payment-container.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample-payment-container.html
rename to content/containers/deprecated/container/sample-payment-container.html
diff --git a/trunk/content/containers/deprecated/container/sample-payment.xml b/content/containers/deprecated/container/sample-payment.xml
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample-payment.xml
rename to content/containers/deprecated/container/sample-payment.xml
diff --git a/trunk/content/containers/deprecated/container/sample-pubsub-2.html b/content/containers/deprecated/container/sample-pubsub-2.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample-pubsub-2.html
rename to content/containers/deprecated/container/sample-pubsub-2.html
diff --git a/trunk/content/containers/deprecated/container/sample-pubsub-publisher.xml b/content/containers/deprecated/container/sample-pubsub-publisher.xml
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample-pubsub-publisher.xml
rename to content/containers/deprecated/container/sample-pubsub-publisher.xml
diff --git a/trunk/content/containers/deprecated/container/sample-pubsub-subscriber.xml b/content/containers/deprecated/container/sample-pubsub-subscriber.xml
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample-pubsub-subscriber.xml
rename to content/containers/deprecated/container/sample-pubsub-subscriber.xml
diff --git a/trunk/content/containers/deprecated/container/sample-pubsub.html b/content/containers/deprecated/container/sample-pubsub.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample-pubsub.html
rename to content/containers/deprecated/container/sample-pubsub.html
diff --git a/trunk/content/containers/deprecated/container/sample1.html b/content/containers/deprecated/container/sample1.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample1.html
rename to content/containers/deprecated/container/sample1.html
diff --git a/trunk/content/containers/deprecated/container/sample2.html b/content/containers/deprecated/container/sample2.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample2.html
rename to content/containers/deprecated/container/sample2.html
diff --git a/trunk/content/containers/deprecated/container/sample3.html b/content/containers/deprecated/container/sample3.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample3.html
rename to content/containers/deprecated/container/sample3.html
diff --git a/trunk/content/containers/deprecated/container/sample4.html b/content/containers/deprecated/container/sample4.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample4.html
rename to content/containers/deprecated/container/sample4.html
diff --git a/trunk/content/containers/deprecated/container/sample5.html b/content/containers/deprecated/container/sample5.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample5.html
rename to content/containers/deprecated/container/sample5.html
diff --git a/trunk/content/containers/deprecated/container/sample6.html b/content/containers/deprecated/container/sample6.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample6.html
rename to content/containers/deprecated/container/sample6.html
diff --git a/trunk/content/containers/deprecated/container/sample7.html b/content/containers/deprecated/container/sample7.html
similarity index 100%
rename from trunk/content/containers/deprecated/container/sample7.html
rename to content/containers/deprecated/container/sample7.html
diff --git a/trunk/content/containers/deprecated/samplecontainer/getting-started.html b/content/containers/deprecated/samplecontainer/getting-started.html
similarity index 100%
rename from trunk/content/containers/deprecated/samplecontainer/getting-started.html
rename to content/containers/deprecated/samplecontainer/getting-started.html
diff --git a/trunk/content/containers/deprecated/samplecontainer/samplecontainer.html b/content/containers/deprecated/samplecontainer/samplecontainer.html
similarity index 100%
rename from trunk/content/containers/deprecated/samplecontainer/samplecontainer.html
rename to content/containers/deprecated/samplecontainer/samplecontainer.html
diff --git a/trunk/content/containers/deprecated/samplecontainer/samplecontainer.js b/content/containers/deprecated/samplecontainer/samplecontainer.js
similarity index 100%
rename from trunk/content/containers/deprecated/samplecontainer/samplecontainer.js
rename to content/containers/deprecated/samplecontainer/samplecontainer.js
diff --git a/trunk/content/containers/deprecated/samplecontainer/state-basicfriendlist.xml b/content/containers/deprecated/samplecontainer/state-basicfriendlist.xml
similarity index 100%
rename from trunk/content/containers/deprecated/samplecontainer/state-basicfriendlist.xml
rename to content/containers/deprecated/samplecontainer/state-basicfriendlist.xml
diff --git a/trunk/content/containers/deprecated/samplecontainer/state-smallfriendlist.xml b/content/containers/deprecated/samplecontainer/state-smallfriendlist.xml
similarity index 100%
rename from trunk/content/containers/deprecated/samplecontainer/state-smallfriendlist.xml
rename to content/containers/deprecated/samplecontainer/state-smallfriendlist.xml
diff --git a/trunk/content/containers/deprecated/samplecontainer/state.dtd b/content/containers/deprecated/samplecontainer/state.dtd
similarity index 100%
rename from trunk/content/containers/deprecated/samplecontainer/state.dtd
rename to content/containers/deprecated/samplecontainer/state.dtd
diff --git a/trunk/content/containers/embeddedexperiences/AlbumViewer.xml b/content/containers/embeddedexperiences/AlbumViewer.xml
similarity index 100%
rename from trunk/content/containers/embeddedexperiences/AlbumViewer.xml
rename to content/containers/embeddedexperiences/AlbumViewer.xml
diff --git a/trunk/content/containers/embeddedexperiences/BlogViewer.xml b/content/containers/embeddedexperiences/BlogViewer.xml
similarity index 100%
rename from trunk/content/containers/embeddedexperiences/BlogViewer.xml
rename to content/containers/embeddedexperiences/BlogViewer.xml
diff --git a/trunk/content/containers/embeddedexperiences/EEContainer.js b/content/containers/embeddedexperiences/EEContainer.js
similarity index 100%
rename from trunk/content/containers/embeddedexperiences/EEContainer.js
rename to content/containers/embeddedexperiences/EEContainer.js
diff --git a/trunk/content/containers/embeddedexperiences/PhotoList.xml b/content/containers/embeddedexperiences/PhotoList.xml
similarity index 100%
rename from trunk/content/containers/embeddedexperiences/PhotoList.xml
rename to content/containers/embeddedexperiences/PhotoList.xml
diff --git a/trunk/content/containers/embeddedexperiences/index.html b/content/containers/embeddedexperiences/index.html
similarity index 100%
rename from trunk/content/containers/embeddedexperiences/index.html
rename to content/containers/embeddedexperiences/index.html
diff --git a/trunk/content/gadgets/ActivityStreams/ActivityStreamGadget.xml b/content/gadgets/ActivityStreams/ActivityStreamGadget.xml
similarity index 100%
rename from trunk/content/gadgets/ActivityStreams/ActivityStreamGadget.xml
rename to content/gadgets/ActivityStreams/ActivityStreamGadget.xml
diff --git a/trunk/content/gadgets/ActivityStreams/ActivityStreamTemplate.xml b/content/gadgets/ActivityStreams/ActivityStreamTemplate.xml
similarity index 100%
rename from trunk/content/gadgets/ActivityStreams/ActivityStreamTemplate.xml
rename to content/gadgets/ActivityStreams/ActivityStreamTemplate.xml
diff --git a/trunk/content/gadgets/ActivityStreams/ActivityStreamsRender.js b/content/gadgets/ActivityStreams/ActivityStreamsRender.js
similarity index 100%
rename from trunk/content/gadgets/ActivityStreams/ActivityStreamsRender.js
rename to content/gadgets/ActivityStreams/ActivityStreamsRender.js
diff --git a/trunk/content/gadgets/ActivityStreams/OpenSocialWrapper.js b/content/gadgets/ActivityStreams/OpenSocialWrapper.js
similarity index 100%
rename from trunk/content/gadgets/ActivityStreams/OpenSocialWrapper.js
rename to content/gadgets/ActivityStreams/OpenSocialWrapper.js
diff --git a/trunk/content/gadgets/ContainerGadgetDomainTest.xml b/content/gadgets/ContainerGadgetDomainTest.xml
similarity index 100%
rename from trunk/content/gadgets/ContainerGadgetDomainTest.xml
rename to content/gadgets/ContainerGadgetDomainTest.xml
diff --git a/trunk/content/gadgets/ContainerPublish.xml b/content/gadgets/ContainerPublish.xml
similarity index 100%
rename from trunk/content/gadgets/ContainerPublish.xml
rename to content/gadgets/ContainerPublish.xml
diff --git a/trunk/content/gadgets/DynamicSizeDemo.xml b/content/gadgets/DynamicSizeDemo.xml
similarity index 100%
rename from trunk/content/gadgets/DynamicSizeDemo.xml
rename to content/gadgets/DynamicSizeDemo.xml
diff --git a/trunk/content/gadgets/DynamicSizeDemoHTML5.xml b/content/gadgets/DynamicSizeDemoHTML5.xml
similarity index 100%
rename from trunk/content/gadgets/DynamicSizeDemoHTML5.xml
rename to content/gadgets/DynamicSizeDemoHTML5.xml
diff --git a/trunk/content/gadgets/ELInGadgetDemo.xml b/content/gadgets/ELInGadgetDemo.xml
similarity index 100%
rename from trunk/content/gadgets/ELInGadgetDemo.xml
rename to content/gadgets/ELInGadgetDemo.xml
diff --git a/trunk/content/gadgets/FlashBridgeCajaExample.xml b/content/gadgets/FlashBridgeCajaExample.xml
similarity index 100%
rename from trunk/content/gadgets/FlashBridgeCajaExample.xml
rename to content/gadgets/FlashBridgeCajaExample.xml
diff --git a/trunk/content/gadgets/FlashCajaExample.xml b/content/gadgets/FlashCajaExample.xml
similarity index 100%
rename from trunk/content/gadgets/FlashCajaExample.xml
rename to content/gadgets/FlashCajaExample.xml
diff --git a/trunk/content/gadgets/ImageUploadGadget.xml b/content/gadgets/ImageUploadGadget.xml
similarity index 100%
rename from trunk/content/gadgets/ImageUploadGadget.xml
rename to content/gadgets/ImageUploadGadget.xml
diff --git a/trunk/content/gadgets/OpenViews-OpenEE.xml b/content/gadgets/OpenViews-OpenEE.xml
similarity index 100%
rename from trunk/content/gadgets/OpenViews-OpenEE.xml
rename to content/gadgets/OpenViews-OpenEE.xml
diff --git a/trunk/content/gadgets/SharedLockedDomainDemo1.xml b/content/gadgets/SharedLockedDomainDemo1.xml
similarity index 100%
rename from trunk/content/gadgets/SharedLockedDomainDemo1.xml
rename to content/gadgets/SharedLockedDomainDemo1.xml
diff --git a/trunk/content/gadgets/SharedLockedDomainDemo2.xml b/content/gadgets/SharedLockedDomainDemo2.xml
similarity index 100%
rename from trunk/content/gadgets/SharedLockedDomainDemo2.xml
rename to content/gadgets/SharedLockedDomainDemo2.xml
diff --git a/trunk/content/gadgets/SharedScriptFrameDemo.xml b/content/gadgets/SharedScriptFrameDemo.xml
similarity index 100%
rename from trunk/content/gadgets/SharedScriptFrameDemo.xml
rename to content/gadgets/SharedScriptFrameDemo.xml
diff --git a/trunk/content/gadgets/SocialActivitiesWorld.xml b/content/gadgets/SocialActivitiesWorld.xml
similarity index 100%
rename from trunk/content/gadgets/SocialActivitiesWorld.xml
rename to content/gadgets/SocialActivitiesWorld.xml
diff --git a/trunk/content/gadgets/SocialCajaWorld.xml b/content/gadgets/SocialCajaWorld.xml
similarity index 100%
rename from trunk/content/gadgets/SocialCajaWorld.xml
rename to content/gadgets/SocialCajaWorld.xml
diff --git a/trunk/content/gadgets/SocialHelloWorld.xml b/content/gadgets/SocialHelloWorld.xml
similarity index 100%
rename from trunk/content/gadgets/SocialHelloWorld.xml
rename to content/gadgets/SocialHelloWorld.xml
diff --git a/trunk/content/gadgets/compliance-1.0/ExpressionLangSample.xml b/content/gadgets/compliance-1.0/ExpressionLangSample.xml
similarity index 100%
rename from trunk/content/gadgets/compliance-1.0/ExpressionLangSample.xml
rename to content/gadgets/compliance-1.0/ExpressionLangSample.xml
diff --git a/trunk/content/gadgets/compliance-1.0/customTagTemplates.xml b/content/gadgets/compliance-1.0/customTagTemplates.xml
similarity index 100%
rename from trunk/content/gadgets/compliance-1.0/customTagTemplates.xml
rename to content/gadgets/compliance-1.0/customTagTemplates.xml
diff --git a/trunk/content/gadgets/compliance-1.0/helloViewerAndFriends.xml b/content/gadgets/compliance-1.0/helloViewerAndFriends.xml
similarity index 100%
rename from trunk/content/gadgets/compliance-1.0/helloViewerAndFriends.xml
rename to content/gadgets/compliance-1.0/helloViewerAndFriends.xml
diff --git a/trunk/content/gadgets/compliance-1.0/helloWorld.xml b/content/gadgets/compliance-1.0/helloWorld.xml
similarity index 100%
rename from trunk/content/gadgets/compliance-1.0/helloWorld.xml
rename to content/gadgets/compliance-1.0/helloWorld.xml
diff --git a/trunk/content/gadgets/compliance-1.0/helloWorld_FriendsAndViews.xml b/content/gadgets/compliance-1.0/helloWorld_FriendsAndViews.xml
similarity index 100%
rename from trunk/content/gadgets/compliance-1.0/helloWorld_FriendsAndViews.xml
rename to content/gadgets/compliance-1.0/helloWorld_FriendsAndViews.xml
diff --git a/trunk/content/gadgets/compliance-1.0/nestedCustomTagsWithFriends.xml b/content/gadgets/compliance-1.0/nestedCustomTagsWithFriends.xml
similarity index 100%
rename from trunk/content/gadgets/compliance-1.0/nestedCustomTagsWithFriends.xml
rename to content/gadgets/compliance-1.0/nestedCustomTagsWithFriends.xml
diff --git a/trunk/content/gadgets/compliance-1.0/osVarTestGadget.xml b/content/gadgets/compliance-1.0/osVarTestGadget.xml
similarity index 100%
rename from trunk/content/gadgets/compliance-1.0/osVarTestGadget.xml
rename to content/gadgets/compliance-1.0/osVarTestGadget.xml
diff --git a/trunk/content/gadgets/compliance-1.0/ownerRequestViewerRequest.xml b/content/gadgets/compliance-1.0/ownerRequestViewerRequest.xml
similarity index 100%
rename from trunk/content/gadgets/compliance-1.0/ownerRequestViewerRequest.xml
rename to content/gadgets/compliance-1.0/ownerRequestViewerRequest.xml
diff --git a/trunk/content/gadgets/compliance-1.0/sampleAlbumAndContents.xml b/content/gadgets/compliance-1.0/sampleAlbumAndContents.xml
similarity index 100%
rename from trunk/content/gadgets/compliance-1.0/sampleAlbumAndContents.xml
rename to content/gadgets/compliance-1.0/sampleAlbumAndContents.xml
diff --git a/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/activitiessuite.js b/content/gadgets/compliance/javascript-tests/1.1/activities/activitiessuite.js
similarity index 100%
rename from trunk/content/gadgets/compliance/javascript-tests/1.1/activities/activitiessuite.js
rename to content/gadgets/compliance/javascript-tests/1.1/activities/activitiessuite.js
diff --git a/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/suite.xml b/content/gadgets/compliance/javascript-tests/1.1/activities/suite.xml
similarity index 100%
rename from trunk/content/gadgets/compliance/javascript-tests/1.1/activities/suite.xml
rename to content/gadgets/compliance/javascript-tests/1.1/activities/suite.xml
diff --git a/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/appdatasuite.js b/content/gadgets/compliance/javascript-tests/1.1/appdata/appdatasuite.js
similarity index 100%
rename from trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/appdatasuite.js
rename to content/gadgets/compliance/javascript-tests/1.1/appdata/appdatasuite.js
diff --git a/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/suite.xml b/content/gadgets/compliance/javascript-tests/1.1/appdata/suite.xml
similarity index 100%
rename from trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/suite.xml
rename to content/gadgets/compliance/javascript-tests/1.1/appdata/suite.xml
diff --git a/trunk/content/gadgets/compliance/javascript-tests/1.1/people/peoplesuite.js b/content/gadgets/compliance/javascript-tests/1.1/people/peoplesuite.js
similarity index 100%
rename from trunk/content/gadgets/compliance/javascript-tests/1.1/people/peoplesuite.js
rename to content/gadgets/compliance/javascript-tests/1.1/people/peoplesuite.js
diff --git a/trunk/content/gadgets/compliance/javascript-tests/1.1/people/suite.xml b/content/gadgets/compliance/javascript-tests/1.1/people/suite.xml
similarity index 100%
rename from trunk/content/gadgets/compliance/javascript-tests/1.1/people/suite.xml
rename to content/gadgets/compliance/javascript-tests/1.1/people/suite.xml
diff --git a/trunk/content/gadgets/compliance/javascript-tests/1.1/suite.xml b/content/gadgets/compliance/javascript-tests/1.1/suite.xml
similarity index 100%
rename from trunk/content/gadgets/compliance/javascript-tests/1.1/suite.xml
rename to content/gadgets/compliance/javascript-tests/1.1/suite.xml
diff --git a/trunk/content/gadgets/datapipeline/ViewerRequestTest.xml b/content/gadgets/datapipeline/ViewerRequestTest.xml
similarity index 100%
rename from trunk/content/gadgets/datapipeline/ViewerRequestTest.xml
rename to content/gadgets/datapipeline/ViewerRequestTest.xml
diff --git a/trunk/content/gadgets/media-openGadgets/Media.xml b/content/gadgets/media-openGadgets/Media.xml
similarity index 100%
rename from trunk/content/gadgets/media-openGadgets/Media.xml
rename to content/gadgets/media-openGadgets/Media.xml
diff --git a/trunk/content/gadgets/media-openGadgets/MediaUIOpenGadgets.js b/content/gadgets/media-openGadgets/MediaUIOpenGadgets.js
similarity index 100%
rename from trunk/content/gadgets/media-openGadgets/MediaUIOpenGadgets.js
rename to content/gadgets/media-openGadgets/MediaUIOpenGadgets.js
diff --git a/trunk/content/gadgets/media-openGadgets/Social.js b/content/gadgets/media-openGadgets/Social.js
similarity index 100%
rename from trunk/content/gadgets/media-openGadgets/Social.js
rename to content/gadgets/media-openGadgets/Social.js
diff --git a/trunk/content/gadgets/media-openGadgets/styles.css b/content/gadgets/media-openGadgets/styles.css
similarity index 100%
rename from trunk/content/gadgets/media-openGadgets/styles.css
rename to content/gadgets/media-openGadgets/styles.css
diff --git a/trunk/content/gadgets/media/Media.xml b/content/gadgets/media/Media.xml
similarity index 100%
rename from trunk/content/gadgets/media/Media.xml
rename to content/gadgets/media/Media.xml
diff --git a/trunk/content/gadgets/media/MediaUI.js b/content/gadgets/media/MediaUI.js
similarity index 100%
rename from trunk/content/gadgets/media/MediaUI.js
rename to content/gadgets/media/MediaUI.js
diff --git a/trunk/content/gadgets/media/Social.js b/content/gadgets/media/Social.js
similarity index 100%
rename from trunk/content/gadgets/media/Social.js
rename to content/gadgets/media/Social.js
diff --git a/trunk/content/gadgets/media/styles.css b/content/gadgets/media/styles.css
similarity index 100%
rename from trunk/content/gadgets/media/styles.css
rename to content/gadgets/media/styles.css
diff --git a/trunk/content/gadgets/oauth.xml b/content/gadgets/oauth.xml
similarity index 100%
rename from trunk/content/gadgets/oauth.xml
rename to content/gadgets/oauth.xml
diff --git a/trunk/content/gadgets/oauth2/oauth2_facebook.xml b/content/gadgets/oauth2/oauth2_facebook.xml
similarity index 100%
rename from trunk/content/gadgets/oauth2/oauth2_facebook.xml
rename to content/gadgets/oauth2/oauth2_facebook.xml
diff --git a/trunk/content/gadgets/oauth2/oauth2_google.xml b/content/gadgets/oauth2/oauth2_google.xml
similarity index 100%
rename from trunk/content/gadgets/oauth2/oauth2_google.xml
rename to content/gadgets/oauth2/oauth2_google.xml
diff --git a/trunk/content/gadgets/oauth2/oauth2_google_shared1.xml b/content/gadgets/oauth2/oauth2_google_shared1.xml
similarity index 100%
rename from trunk/content/gadgets/oauth2/oauth2_google_shared1.xml
rename to content/gadgets/oauth2/oauth2_google_shared1.xml
diff --git a/trunk/content/gadgets/oauth2/oauth2_google_shared2.xml b/content/gadgets/oauth2/oauth2_google_shared2.xml
similarity index 100%
rename from trunk/content/gadgets/oauth2/oauth2_google_shared2.xml
rename to content/gadgets/oauth2/oauth2_google_shared2.xml
diff --git a/trunk/content/gadgets/oauth2/oauth2_spring_proxy.xml b/content/gadgets/oauth2/oauth2_spring_proxy.xml
similarity index 100%
rename from trunk/content/gadgets/oauth2/oauth2_spring_proxy.xml
rename to content/gadgets/oauth2/oauth2_spring_proxy.xml
diff --git a/trunk/content/gadgets/oauth2/oauth2_windowslive.xml b/content/gadgets/oauth2/oauth2_windowslive.xml
similarity index 100%
rename from trunk/content/gadgets/oauth2/oauth2_windowslive.xml
rename to content/gadgets/oauth2/oauth2_windowslive.xml
diff --git a/trunk/content/gadgets/oauth2/shindig_authorization.xml b/content/gadgets/oauth2/shindig_authorization.xml
similarity index 100%
rename from trunk/content/gadgets/oauth2/shindig_authorization.xml
rename to content/gadgets/oauth2/shindig_authorization.xml
diff --git a/trunk/content/gadgets/oauth2/shindig_client_credentials.xml b/content/gadgets/oauth2/shindig_client_credentials.xml
similarity index 100%
rename from trunk/content/gadgets/oauth2/shindig_client_credentials.xml
rename to content/gadgets/oauth2/shindig_client_credentials.xml
diff --git a/trunk/content/gadgets/rewriter/feather.png b/content/gadgets/rewriter/feather.png
similarity index 100%
rename from trunk/content/gadgets/rewriter/feather.png
rename to content/gadgets/rewriter/feather.png
Binary files differ
diff --git a/trunk/content/gadgets/rewriter/rewriter1.css b/content/gadgets/rewriter/rewriter1.css
similarity index 100%
rename from trunk/content/gadgets/rewriter/rewriter1.css
rename to content/gadgets/rewriter/rewriter1.css
diff --git a/trunk/content/gadgets/rewriter/rewriter1.js b/content/gadgets/rewriter/rewriter1.js
similarity index 100%
rename from trunk/content/gadgets/rewriter/rewriter1.js
rename to content/gadgets/rewriter/rewriter1.js
diff --git a/trunk/content/gadgets/rewriter/rewriter2.css b/content/gadgets/rewriter/rewriter2.css
similarity index 100%
rename from trunk/content/gadgets/rewriter/rewriter2.css
rename to content/gadgets/rewriter/rewriter2.css
diff --git a/trunk/content/gadgets/rewriter/rewriter2.js b/content/gadgets/rewriter/rewriter2.js
similarity index 100%
rename from trunk/content/gadgets/rewriter/rewriter2.js
rename to content/gadgets/rewriter/rewriter2.js
diff --git a/trunk/content/gadgets/rewriter/rewriteroff.xml b/content/gadgets/rewriter/rewriteroff.xml
similarity index 100%
rename from trunk/content/gadgets/rewriter/rewriteroff.xml
rename to content/gadgets/rewriter/rewriteroff.xml
diff --git a/trunk/content/gadgets/rewriter/rewriteron.html b/content/gadgets/rewriter/rewriteron.html
similarity index 100%
rename from trunk/content/gadgets/rewriter/rewriteron.html
rename to content/gadgets/rewriter/rewriteron.html
diff --git a/trunk/content/gadgets/rewriter/rewriteron.xml b/content/gadgets/rewriter/rewriteron.xml
similarity index 100%
rename from trunk/content/gadgets/rewriter/rewriteron.xml
rename to content/gadgets/rewriter/rewriteron.xml
diff --git a/trunk/content/gadgets/sample-pubsub-2-publisher.xml b/content/gadgets/sample-pubsub-2-publisher.xml
similarity index 100%
rename from trunk/content/gadgets/sample-pubsub-2-publisher.xml
rename to content/gadgets/sample-pubsub-2-publisher.xml
diff --git a/trunk/content/gadgets/sample-pubsub-2-subscriber.xml b/content/gadgets/sample-pubsub-2-subscriber.xml
similarity index 100%
rename from trunk/content/gadgets/sample-pubsub-2-subscriber.xml
rename to content/gadgets/sample-pubsub-2-subscriber.xml
diff --git a/trunk/content/gadgets/shindigoauth.xml b/content/gadgets/shindigoauth.xml
similarity index 100%
rename from trunk/content/gadgets/shindigoauth.xml
rename to content/gadgets/shindigoauth.xml
diff --git a/trunk/content/gadgets/templates/FlashTag.xml b/content/gadgets/templates/FlashTag.xml
similarity index 100%
rename from trunk/content/gadgets/templates/FlashTag.xml
rename to content/gadgets/templates/FlashTag.xml
diff --git a/trunk/content/gadgets/templates/RelativeTemplateLibrary.xml b/content/gadgets/templates/RelativeTemplateLibrary.xml
similarity index 100%
rename from trunk/content/gadgets/templates/RelativeTemplateLibrary.xml
rename to content/gadgets/templates/RelativeTemplateLibrary.xml
diff --git a/trunk/content/gadgets/templates/TemplateClientAPI.xml b/content/gadgets/templates/TemplateClientAPI.xml
similarity index 100%
rename from trunk/content/gadgets/templates/TemplateClientAPI.xml
rename to content/gadgets/templates/TemplateClientAPI.xml
diff --git a/trunk/content/gadgets/templates/TestTemplateLibrary.xml b/content/gadgets/templates/TestTemplateLibrary.xml
similarity index 100%
rename from trunk/content/gadgets/templates/TestTemplateLibrary.xml
rename to content/gadgets/templates/TestTemplateLibrary.xml
diff --git a/trunk/content/gadgets/templates/VarTag.xml b/content/gadgets/templates/VarTag.xml
similarity index 100%
rename from trunk/content/gadgets/templates/VarTag.xml
rename to content/gadgets/templates/VarTag.xml
diff --git a/trunk/content/gadgets/url-gadget-with-features/url.html b/content/gadgets/url-gadget-with-features/url.html
similarity index 100%
rename from trunk/content/gadgets/url-gadget-with-features/url.html
rename to content/gadgets/url-gadget-with-features/url.html
diff --git a/trunk/content/gadgets/url-gadget-with-features/url.xml b/content/gadgets/url-gadget-with-features/url.xml
similarity index 100%
rename from trunk/content/gadgets/url-gadget-with-features/url.xml
rename to content/gadgets/url-gadget-with-features/url.xml
diff --git a/trunk/content/images/bubble.gif b/content/images/bubble.gif
similarity index 100%
rename from trunk/content/images/bubble.gif
rename to content/images/bubble.gif
Binary files differ
diff --git a/trunk/content/images/icon.png b/content/images/icon.png
similarity index 100%
rename from trunk/content/images/icon.png
rename to content/images/icon.png
Binary files differ
diff --git a/trunk/content/images/new.gif b/content/images/new.gif
similarity index 100%
rename from trunk/content/images/new.gif
rename to content/images/new.gif
Binary files differ
diff --git a/trunk/content/images/nophoto.gif b/content/images/nophoto.gif
similarity index 100%
rename from trunk/content/images/nophoto.gif
rename to content/images/nophoto.gif
Binary files differ
diff --git a/trunk/content/sampledata/canonicaldb.json b/content/sampledata/canonicaldb.json
similarity index 100%
rename from trunk/content/sampledata/canonicaldb.json
rename to content/sampledata/canonicaldb.json
diff --git a/trunk/content/xpc.swf b/content/xpc.swf
similarity index 100%
rename from trunk/content/xpc.swf
rename to content/xpc.swf
Binary files differ
diff --git a/trunk/doap_shindig.rdf b/doap_shindig.rdf
similarity index 100%
rename from trunk/doap_shindig.rdf
rename to doap_shindig.rdf
diff --git a/trunk/etc/check_staged_release.sh b/etc/check_staged_release.sh
similarity index 100%
rename from trunk/etc/check_staged_release.sh
rename to etc/check_staged_release.sh
diff --git a/trunk/etc/checkstyle/README b/etc/checkstyle/README
similarity index 100%
rename from trunk/etc/checkstyle/README
rename to etc/checkstyle/README
diff --git a/trunk/etc/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml
similarity index 100%
rename from trunk/etc/checkstyle/checkstyle.xml
rename to etc/checkstyle/checkstyle.xml
diff --git a/trunk/etc/checkstyle/java.header b/etc/checkstyle/java.header
similarity index 100%
rename from trunk/etc/checkstyle/java.header
rename to etc/checkstyle/java.header
diff --git a/trunk/etc/cruisecontrol/README b/etc/cruisecontrol/README
similarity index 100%
rename from trunk/etc/cruisecontrol/README
rename to etc/cruisecontrol/README
diff --git a/trunk/etc/eclipse/README b/etc/eclipse/README
similarity index 100%
rename from trunk/etc/eclipse/README
rename to etc/eclipse/README
diff --git a/trunk/etc/eclipse/shindig-eclipse-cleanup.xml b/etc/eclipse/shindig-eclipse-cleanup.xml
similarity index 100%
rename from trunk/etc/eclipse/shindig-eclipse-cleanup.xml
rename to etc/eclipse/shindig-eclipse-cleanup.xml
diff --git a/trunk/etc/eclipse/shindig-eclipse-codestyle_2.xml b/etc/eclipse/shindig-eclipse-codestyle_2.xml
similarity index 100%
rename from trunk/etc/eclipse/shindig-eclipse-codestyle_2.xml
rename to etc/eclipse/shindig-eclipse-codestyle_2.xml
diff --git a/trunk/etc/eclipse/shindig-eclipse-codetemplate.xml b/etc/eclipse/shindig-eclipse-codetemplate.xml
similarity index 100%
rename from trunk/etc/eclipse/shindig-eclipse-codetemplate.xml
rename to etc/eclipse/shindig-eclipse-codetemplate.xml
diff --git a/trunk/etc/eclipse/shindig-eclipse-javascript-cleanup.xml b/etc/eclipse/shindig-eclipse-javascript-cleanup.xml
similarity index 100%
rename from trunk/etc/eclipse/shindig-eclipse-javascript-cleanup.xml
rename to etc/eclipse/shindig-eclipse-javascript-cleanup.xml
diff --git a/trunk/etc/eclipse/shindig-eclipse-javascript-codestyle.xml b/etc/eclipse/shindig-eclipse-javascript-codestyle.xml
similarity index 100%
rename from trunk/etc/eclipse/shindig-eclipse-javascript-codestyle.xml
rename to etc/eclipse/shindig-eclipse-javascript-codestyle.xml
diff --git a/trunk/etc/eclipse/shindig-eclipse-javascript-codetemplate.xml b/etc/eclipse/shindig-eclipse-javascript-codetemplate.xml
similarity index 100%
rename from trunk/etc/eclipse/shindig-eclipse-javascript-codetemplate.xml
rename to etc/eclipse/shindig-eclipse-javascript-codetemplate.xml
diff --git a/trunk/etc/eclipse/shindig.importorder b/etc/eclipse/shindig.importorder
similarity index 100%
rename from trunk/etc/eclipse/shindig.importorder
rename to etc/eclipse/shindig.importorder
diff --git a/trunk/etc/run-gjslint b/etc/run-gjslint
similarity index 100%
rename from trunk/etc/run-gjslint
rename to etc/run-gjslint
diff --git a/trunk/etc/set_svn_properties.sh b/etc/set_svn_properties.sh
similarity index 100%
rename from trunk/etc/set_svn_properties.sh
rename to etc/set_svn_properties.sh
diff --git a/trunk/etc/svn-ignores b/etc/svn-ignores
similarity index 100%
rename from trunk/etc/svn-ignores
rename to etc/svn-ignores
diff --git a/trunk/etc/svn-props b/etc/svn-props
similarity index 100%
rename from trunk/etc/svn-props
rename to etc/svn-props
diff --git a/trunk/etc/to-committers.xsl b/etc/to-committers.xsl
similarity index 100%
rename from trunk/etc/to-committers.xsl
rename to etc/to-committers.xsl
diff --git a/trunk/extras/pom.xml b/extras/pom.xml
similarity index 100%
rename from trunk/extras/pom.xml
rename to extras/pom.xml
diff --git a/trunk/extras/src/main/appended-resources/META-INF/LICENSE b/extras/src/main/appended-resources/META-INF/LICENSE
similarity index 100%
rename from trunk/extras/src/main/appended-resources/META-INF/LICENSE
rename to extras/src/main/appended-resources/META-INF/LICENSE
diff --git a/trunk/extras/src/main/appended-resources/META-INF/NOTICE b/extras/src/main/appended-resources/META-INF/NOTICE
similarity index 100%
rename from trunk/extras/src/main/appended-resources/META-INF/NOTICE
rename to extras/src/main/appended-resources/META-INF/NOTICE
diff --git a/trunk/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java b/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java
similarity index 100%
rename from trunk/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java
rename to extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java
diff --git a/trunk/extras/src/main/javascript/features-extras/analytics/feature.xml b/extras/src/main/javascript/features-extras/analytics/feature.xml
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/analytics/feature.xml
rename to extras/src/main/javascript/features-extras/analytics/feature.xml
diff --git a/trunk/extras/src/main/javascript/features-extras/com.google.gadgets.analytics/analytics.js b/extras/src/main/javascript/features-extras/com.google.gadgets.analytics/analytics.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/com.google.gadgets.analytics/analytics.js
rename to extras/src/main/javascript/features-extras/com.google.gadgets.analytics/analytics.js
diff --git a/trunk/extras/src/main/javascript/features-extras/com.google.gadgets.analytics/feature.xml b/extras/src/main/javascript/features-extras/com.google.gadgets.analytics/feature.xml
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/com.google.gadgets.analytics/feature.xml
rename to extras/src/main/javascript/features-extras/com.google.gadgets.analytics/feature.xml
diff --git a/trunk/extras/src/main/javascript/features-extras/com.google.gadgets.analytics/taming.js b/extras/src/main/javascript/features-extras/com.google.gadgets.analytics/taming.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/com.google.gadgets.analytics/taming.js
rename to extras/src/main/javascript/features-extras/com.google.gadgets.analytics/taming.js
diff --git a/trunk/extras/src/main/javascript/features-extras/features.txt b/extras/src/main/javascript/features-extras/features.txt
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/features.txt
rename to extras/src/main/javascript/features-extras/features.txt
diff --git a/trunk/extras/src/main/javascript/features-extras/firebug-lite/feature.xml b/extras/src/main/javascript/features-extras/firebug-lite/feature.xml
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/firebug-lite/feature.xml
rename to extras/src/main/javascript/features-extras/firebug-lite/feature.xml
diff --git a/trunk/extras/src/main/javascript/features-extras/opensocial-payment/billingitem.js b/extras/src/main/javascript/features-extras/opensocial-payment/billingitem.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/opensocial-payment/billingitem.js
rename to extras/src/main/javascript/features-extras/opensocial-payment/billingitem.js
diff --git a/trunk/extras/src/main/javascript/features-extras/opensocial-payment/container.js b/extras/src/main/javascript/features-extras/opensocial-payment/container.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/opensocial-payment/container.js
rename to extras/src/main/javascript/features-extras/opensocial-payment/container.js
diff --git a/trunk/extras/src/main/javascript/features-extras/opensocial-payment/feature.xml b/extras/src/main/javascript/features-extras/opensocial-payment/feature.xml
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/opensocial-payment/feature.xml
rename to extras/src/main/javascript/features-extras/opensocial-payment/feature.xml
diff --git a/trunk/extras/src/main/javascript/features-extras/opensocial-payment/jsoncontainer.js b/extras/src/main/javascript/features-extras/opensocial-payment/jsoncontainer.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/opensocial-payment/jsoncontainer.js
rename to extras/src/main/javascript/features-extras/opensocial-payment/jsoncontainer.js
diff --git a/trunk/extras/src/main/javascript/features-extras/opensocial-payment/jsonpayment.js b/extras/src/main/javascript/features-extras/opensocial-payment/jsonpayment.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/opensocial-payment/jsonpayment.js
rename to extras/src/main/javascript/features-extras/opensocial-payment/jsonpayment.js
diff --git a/trunk/extras/src/main/javascript/features-extras/opensocial-payment/opensocial.js b/extras/src/main/javascript/features-extras/opensocial-payment/opensocial.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/opensocial-payment/opensocial.js
rename to extras/src/main/javascript/features-extras/opensocial-payment/opensocial.js
diff --git a/trunk/extras/src/main/javascript/features-extras/opensocial-payment/payment.js b/extras/src/main/javascript/features-extras/opensocial-payment/payment.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/opensocial-payment/payment.js
rename to extras/src/main/javascript/features-extras/opensocial-payment/payment.js
diff --git a/trunk/extras/src/main/javascript/features-extras/opensocial-payment/paymentprocessor.js b/extras/src/main/javascript/features-extras/opensocial-payment/paymentprocessor.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/opensocial-payment/paymentprocessor.js
rename to extras/src/main/javascript/features-extras/opensocial-payment/paymentprocessor.js
diff --git a/trunk/extras/src/main/javascript/features-extras/org.jquery.core-1.4.2/feature.xml b/extras/src/main/javascript/features-extras/org.jquery.core-1.4.2/feature.xml
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/org.jquery.core-1.4.2/feature.xml
rename to extras/src/main/javascript/features-extras/org.jquery.core-1.4.2/feature.xml
diff --git a/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/OpenAjax-mashup.js b/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/OpenAjax-mashup.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/OpenAjax-mashup.js
rename to extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/OpenAjax-mashup.js
diff --git a/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/README.txt b/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/README.txt
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/README.txt
rename to extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/README.txt
diff --git a/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/crypto.js b/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/crypto.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/crypto.js
rename to extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/crypto.js
diff --git a/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/feature.xml b/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/feature.xml
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/feature.xml
rename to extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/feature.xml
diff --git a/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/iframe.js b/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/iframe.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/iframe.js
rename to extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/iframe.js
diff --git a/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/inline.js b/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/inline.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/inline.js
rename to extras/src/main/javascript/features-extras/org.openajax.hub-2.0.7/inline.js
diff --git a/trunk/extras/src/main/javascript/features-extras/pubsub-2/feature.xml b/extras/src/main/javascript/features-extras/pubsub-2/feature.xml
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/pubsub-2/feature.xml
rename to extras/src/main/javascript/features-extras/pubsub-2/feature.xml
diff --git a/trunk/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2-router.js b/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2-router.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2-router.js
rename to extras/src/main/javascript/features-extras/pubsub-2/pubsub-2-router.js
diff --git a/trunk/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js b/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js
rename to extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js
diff --git a/trunk/extras/src/main/javascript/features-extras/pubsub-2/taming.js b/extras/src/main/javascript/features-extras/pubsub-2/taming.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/pubsub-2/taming.js
rename to extras/src/main/javascript/features-extras/pubsub-2/taming.js
diff --git a/trunk/extras/src/main/javascript/features-extras/swfobject/feature.xml b/extras/src/main/javascript/features-extras/swfobject/feature.xml
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/swfobject/feature.xml
rename to extras/src/main/javascript/features-extras/swfobject/feature.xml
diff --git a/trunk/extras/src/main/javascript/features-extras/swfobject/swfobject.js b/extras/src/main/javascript/features-extras/swfobject/swfobject.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/swfobject/swfobject.js
rename to extras/src/main/javascript/features-extras/swfobject/swfobject.js
diff --git a/trunk/extras/src/main/javascript/features-extras/swfobject/swfobject.opt.js b/extras/src/main/javascript/features-extras/swfobject/swfobject.opt.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/swfobject/swfobject.opt.js
rename to extras/src/main/javascript/features-extras/swfobject/swfobject.opt.js
diff --git a/trunk/extras/src/main/javascript/features-extras/wave/base.js b/extras/src/main/javascript/features-extras/wave/base.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/wave/base.js
rename to extras/src/main/javascript/features-extras/wave/base.js
diff --git a/trunk/extras/src/main/javascript/features-extras/wave/dynamic-width.js b/extras/src/main/javascript/features-extras/wave/dynamic-width.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/wave/dynamic-width.js
rename to extras/src/main/javascript/features-extras/wave/dynamic-width.js
diff --git a/trunk/extras/src/main/javascript/features-extras/wave/externs.js b/extras/src/main/javascript/features-extras/wave/externs.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/wave/externs.js
rename to extras/src/main/javascript/features-extras/wave/externs.js
diff --git a/trunk/extras/src/main/javascript/features-extras/wave/fake_gadgets.js b/extras/src/main/javascript/features-extras/wave/fake_gadgets.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/wave/fake_gadgets.js
rename to extras/src/main/javascript/features-extras/wave/fake_gadgets.js
diff --git a/trunk/extras/src/main/javascript/features-extras/wave/feature.xml b/extras/src/main/javascript/features-extras/wave/feature.xml
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/wave/feature.xml
rename to extras/src/main/javascript/features-extras/wave/feature.xml
diff --git a/trunk/extras/src/main/javascript/features-extras/wave/participant.js b/extras/src/main/javascript/features-extras/wave/participant.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/wave/participant.js
rename to extras/src/main/javascript/features-extras/wave/participant.js
diff --git a/trunk/extras/src/main/javascript/features-extras/wave/state.js b/extras/src/main/javascript/features-extras/wave/state.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/wave/state.js
rename to extras/src/main/javascript/features-extras/wave/state.js
diff --git a/trunk/extras/src/main/javascript/features-extras/wave/taming.js b/extras/src/main/javascript/features-extras/wave/taming.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/wave/taming.js
rename to extras/src/main/javascript/features-extras/wave/taming.js
diff --git a/trunk/extras/src/main/javascript/features-extras/wave/util.js b/extras/src/main/javascript/features-extras/wave/util.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/wave/util.js
rename to extras/src/main/javascript/features-extras/wave/util.js
diff --git a/trunk/extras/src/main/javascript/features-extras/wave/wave.js b/extras/src/main/javascript/features-extras/wave/wave.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/wave/wave.js
rename to extras/src/main/javascript/features-extras/wave/wave.js
diff --git a/trunk/extras/src/main/javascript/features-extras/wave/wave.ui.js b/extras/src/main/javascript/features-extras/wave/wave.ui.js
similarity index 100%
rename from trunk/extras/src/main/javascript/features-extras/wave/wave.ui.js
rename to extras/src/main/javascript/features-extras/wave/wave.ui.js
diff --git a/trunk/features/README b/features/README
similarity index 100%
rename from trunk/features/README
rename to features/README
diff --git a/trunk/features/bin/README b/features/bin/README
similarity index 100%
rename from trunk/features/bin/README
rename to features/bin/README
diff --git a/trunk/features/bin/runner.sh b/features/bin/runner.sh
similarity index 100%
rename from trunk/features/bin/runner.sh
rename to features/bin/runner.sh
diff --git a/trunk/features/pom.xml b/features/pom.xml
similarity index 100%
rename from trunk/features/pom.xml
rename to features/pom.xml
diff --git a/trunk/features/src/main/appended-resources/META-INF/LICENSE b/features/src/main/appended-resources/META-INF/LICENSE
similarity index 100%
rename from trunk/features/src/main/appended-resources/META-INF/LICENSE
rename to features/src/main/appended-resources/META-INF/LICENSE
diff --git a/trunk/features/src/main/appended-resources/META-INF/NOTICE b/features/src/main/appended-resources/META-INF/NOTICE
similarity index 100%
rename from trunk/features/src/main/appended-resources/META-INF/NOTICE
rename to features/src/main/appended-resources/META-INF/NOTICE
diff --git a/trunk/features/src/main/flex/Main.as b/features/src/main/flex/Main.as
similarity index 100%
rename from trunk/features/src/main/flex/Main.as
rename to features/src/main/flex/Main.as
diff --git a/trunk/features/src/main/javascript/features/actions/actions.js b/features/src/main/javascript/features/actions/actions.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/actions/actions.js
rename to features/src/main/javascript/features/actions/actions.js
diff --git a/trunk/features/src/main/javascript/features/actions/actions_container.js b/features/src/main/javascript/features/actions/actions_container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/actions/actions_container.js
rename to features/src/main/javascript/features/actions/actions_container.js
diff --git a/trunk/features/src/main/javascript/features/actions/constants.js b/features/src/main/javascript/features/actions/constants.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/actions/constants.js
rename to features/src/main/javascript/features/actions/constants.js
diff --git a/trunk/features/src/main/javascript/features/actions/feature.xml b/features/src/main/javascript/features/actions/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/actions/feature.xml
rename to features/src/main/javascript/features/actions/feature.xml
diff --git a/trunk/features/src/main/javascript/features/actions/taming.js b/features/src/main/javascript/features/actions/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/actions/taming.js
rename to features/src/main/javascript/features/actions/taming.js
diff --git a/trunk/features/src/main/javascript/features/auth-refresh/auth-refresh.js b/features/src/main/javascript/features/auth-refresh/auth-refresh.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/auth-refresh/auth-refresh.js
rename to features/src/main/javascript/features/auth-refresh/auth-refresh.js
diff --git a/trunk/features/src/main/javascript/features/auth-refresh/feature.xml b/features/src/main/javascript/features/auth-refresh/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/auth-refresh/feature.xml
rename to features/src/main/javascript/features/auth-refresh/feature.xml
diff --git a/trunk/features/src/main/javascript/features/caja/caja-debug.xml b/features/src/main/javascript/features/caja/caja-debug.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/caja/caja-debug.xml
rename to features/src/main/javascript/features/caja/caja-debug.xml
diff --git a/trunk/features/src/main/javascript/features/caja/es53-guest-frame.opt.xml b/features/src/main/javascript/features/caja/es53-guest-frame.opt.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/caja/es53-guest-frame.opt.xml
rename to features/src/main/javascript/features/caja/es53-guest-frame.opt.xml
diff --git a/trunk/features/src/main/javascript/features/caja/es53-guest-frame.xml b/features/src/main/javascript/features/caja/es53-guest-frame.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/caja/es53-guest-frame.xml
rename to features/src/main/javascript/features/caja/es53-guest-frame.xml
diff --git a/trunk/features/src/main/javascript/features/caja/es53-taming-frame.opt.xml b/features/src/main/javascript/features/caja/es53-taming-frame.opt.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/caja/es53-taming-frame.opt.xml
rename to features/src/main/javascript/features/caja/es53-taming-frame.opt.xml
diff --git a/trunk/features/src/main/javascript/features/caja/es53-taming-frame.xml b/features/src/main/javascript/features/caja/es53-taming-frame.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/caja/es53-taming-frame.xml
rename to features/src/main/javascript/features/caja/es53-taming-frame.xml
diff --git a/trunk/features/src/main/javascript/features/caja/feature.xml b/features/src/main/javascript/features/caja/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/caja/feature.xml
rename to features/src/main/javascript/features/caja/feature.xml
diff --git a/trunk/features/src/main/javascript/features/caja/taming.js b/features/src/main/javascript/features/caja/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/caja/taming.js
rename to features/src/main/javascript/features/caja/taming.js
diff --git a/trunk/features/src/main/javascript/features/cloo/cloo.js b/features/src/main/javascript/features/cloo/cloo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/cloo/cloo.js
rename to features/src/main/javascript/features/cloo/cloo.js
diff --git a/trunk/features/src/main/javascript/features/cloo/feature.xml b/features/src/main/javascript/features/cloo/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/cloo/feature.xml
rename to features/src/main/javascript/features/cloo/feature.xml
diff --git a/trunk/features/src/main/javascript/features/container.site.gadget/feature.xml b/features/src/main/javascript/features/container.site.gadget/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.site.gadget/feature.xml
rename to features/src/main/javascript/features/container.site.gadget/feature.xml
diff --git a/trunk/features/src/main/javascript/features/container.site.gadget/gadget_holder.js b/features/src/main/javascript/features/container.site.gadget/gadget_holder.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.site.gadget/gadget_holder.js
rename to features/src/main/javascript/features/container.site.gadget/gadget_holder.js
diff --git a/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js b/features/src/main/javascript/features/container.site.gadget/gadget_site.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js
rename to features/src/main/javascript/features/container.site.gadget/gadget_site.js
diff --git a/trunk/features/src/main/javascript/features/container.site.url/feature.xml b/features/src/main/javascript/features/container.site.url/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.site.url/feature.xml
rename to features/src/main/javascript/features/container.site.url/feature.xml
diff --git a/trunk/features/src/main/javascript/features/container.site.url/url_holder.js b/features/src/main/javascript/features/container.site.url/url_holder.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.site.url/url_holder.js
rename to features/src/main/javascript/features/container.site.url/url_holder.js
diff --git a/trunk/features/src/main/javascript/features/container.site.url/url_site.js b/features/src/main/javascript/features/container.site.url/url_site.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.site.url/url_site.js
rename to features/src/main/javascript/features/container.site.url/url_site.js
diff --git a/trunk/features/src/main/javascript/features/container.site/feature.xml b/features/src/main/javascript/features/container.site/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.site/feature.xml
rename to features/src/main/javascript/features/container.site/feature.xml
diff --git a/trunk/features/src/main/javascript/features/container.site/site.js b/features/src/main/javascript/features/container.site/site.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.site/site.js
rename to features/src/main/javascript/features/container.site/site.js
diff --git a/trunk/features/src/main/javascript/features/container.site/site_holder.js b/features/src/main/javascript/features/container.site/site_holder.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.site/site_holder.js
rename to features/src/main/javascript/features/container.site/site_holder.js
diff --git a/trunk/features/src/main/javascript/features/container.util/constant.js b/features/src/main/javascript/features/container.util/constant.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.util/constant.js
rename to features/src/main/javascript/features/container.util/constant.js
diff --git a/trunk/features/src/main/javascript/features/container.util/feature.xml b/features/src/main/javascript/features/container.util/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.util/feature.xml
rename to features/src/main/javascript/features/container.util/feature.xml
diff --git a/trunk/features/src/main/javascript/features/container.util/util.js b/features/src/main/javascript/features/container.util/util.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/container.util/util.js
rename to features/src/main/javascript/features/container.util/util.js
diff --git a/trunk/features/src/main/javascript/features/container/container.js b/features/src/main/javascript/features/container/container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/container/container.js
rename to features/src/main/javascript/features/container/container.js
diff --git a/trunk/features/src/main/javascript/features/container/feature.xml b/features/src/main/javascript/features/container/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/container/feature.xml
rename to features/src/main/javascript/features/container/feature.xml
diff --git a/trunk/features/src/main/javascript/features/container/init.js b/features/src/main/javascript/features/container/init.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/container/init.js
rename to features/src/main/javascript/features/container/init.js
diff --git a/trunk/features/src/main/javascript/features/container/service.js b/features/src/main/javascript/features/container/service.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/container/service.js
rename to features/src/main/javascript/features/container/service.js
diff --git a/trunk/features/src/main/javascript/features/content-rewrite/feature.xml b/features/src/main/javascript/features/content-rewrite/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/content-rewrite/feature.xml
rename to features/src/main/javascript/features/content-rewrite/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.config.base/config.js b/features/src/main/javascript/features/core.config.base/config.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.config.base/config.js
rename to features/src/main/javascript/features/core.config.base/config.js
diff --git a/trunk/features/src/main/javascript/features/core.config.base/feature.xml b/features/src/main/javascript/features/core.config.base/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.config.base/feature.xml
rename to features/src/main/javascript/features/core.config.base/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.config/feature.xml b/features/src/main/javascript/features/core.config/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.config/feature.xml
rename to features/src/main/javascript/features/core.config/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.config/validators.js b/features/src/main/javascript/features/core.config/validators.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.config/validators.js
rename to features/src/main/javascript/features/core.config/validators.js
diff --git a/trunk/features/src/main/javascript/features/core.io/feature.xml b/features/src/main/javascript/features/core.io/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.io/feature.xml
rename to features/src/main/javascript/features/core.io/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.io/io.js b/features/src/main/javascript/features/core.io/io.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.io/io.js
rename to features/src/main/javascript/features/core.io/io.js
diff --git a/trunk/features/src/main/javascript/features/core.io/taming.js b/features/src/main/javascript/features/core.io/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.io/taming.js
rename to features/src/main/javascript/features/core.io/taming.js
diff --git a/trunk/features/src/main/javascript/features/core.json/feature.xml b/features/src/main/javascript/features/core.json/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.json/feature.xml
rename to features/src/main/javascript/features/core.json/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.json/json-flatten.js b/features/src/main/javascript/features/core.json/json-flatten.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.json/json-flatten.js
rename to features/src/main/javascript/features/core.json/json-flatten.js
diff --git a/trunk/features/src/main/javascript/features/core.json/json-jsimpl.js b/features/src/main/javascript/features/core.json/json-jsimpl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.json/json-jsimpl.js
rename to features/src/main/javascript/features/core.json/json-jsimpl.js
diff --git a/trunk/features/src/main/javascript/features/core.json/json-native.js b/features/src/main/javascript/features/core.json/json-native.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.json/json-native.js
rename to features/src/main/javascript/features/core.json/json-native.js
diff --git a/trunk/features/src/main/javascript/features/core.json/taming.js b/features/src/main/javascript/features/core.json/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.json/taming.js
rename to features/src/main/javascript/features/core.json/taming.js
diff --git a/trunk/features/src/main/javascript/features/core.legacy/feature.xml b/features/src/main/javascript/features/core.legacy/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.legacy/feature.xml
rename to features/src/main/javascript/features/core.legacy/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.legacy/legacy.js b/features/src/main/javascript/features/core.legacy/legacy.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.legacy/legacy.js
rename to features/src/main/javascript/features/core.legacy/legacy.js
diff --git a/trunk/features/src/main/javascript/features/core.log/feature.xml b/features/src/main/javascript/features/core.log/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.log/feature.xml
rename to features/src/main/javascript/features/core.log/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.log/log.js b/features/src/main/javascript/features/core.log/log.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.log/log.js
rename to features/src/main/javascript/features/core.log/log.js
diff --git a/trunk/features/src/main/javascript/features/core.log/taming.js b/features/src/main/javascript/features/core.log/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.log/taming.js
rename to features/src/main/javascript/features/core.log/taming.js
diff --git a/trunk/features/src/main/javascript/features/core.none/feature.xml b/features/src/main/javascript/features/core.none/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.none/feature.xml
rename to features/src/main/javascript/features/core.none/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.prefs/feature.xml b/features/src/main/javascript/features/core.prefs/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.prefs/feature.xml
rename to features/src/main/javascript/features/core.prefs/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.prefs/prefs.js b/features/src/main/javascript/features/core.prefs/prefs.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.prefs/prefs.js
rename to features/src/main/javascript/features/core.prefs/prefs.js
diff --git a/trunk/features/src/main/javascript/features/core.prefs/taming.js b/features/src/main/javascript/features/core.prefs/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.prefs/taming.js
rename to features/src/main/javascript/features/core.prefs/taming.js
diff --git a/trunk/features/src/main/javascript/features/core.util.base/base.js b/features/src/main/javascript/features/core.util.base/base.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.base/base.js
rename to features/src/main/javascript/features/core.util.base/base.js
diff --git a/trunk/features/src/main/javascript/features/core.util.base/feature.xml b/features/src/main/javascript/features/core.util.base/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.base/feature.xml
rename to features/src/main/javascript/features/core.util.base/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.util.base/taming.js b/features/src/main/javascript/features/core.util.base/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.base/taming.js
rename to features/src/main/javascript/features/core.util.base/taming.js
diff --git a/trunk/features/src/main/javascript/features/core.util.dom/dom.js b/features/src/main/javascript/features/core.util.dom/dom.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.dom/dom.js
rename to features/src/main/javascript/features/core.util.dom/dom.js
diff --git a/trunk/features/src/main/javascript/features/core.util.dom/feature.xml b/features/src/main/javascript/features/core.util.dom/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.dom/feature.xml
rename to features/src/main/javascript/features/core.util.dom/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.util.event/event.js b/features/src/main/javascript/features/core.util.event/event.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.event/event.js
rename to features/src/main/javascript/features/core.util.event/event.js
diff --git a/trunk/features/src/main/javascript/features/core.util.event/feature.xml b/features/src/main/javascript/features/core.util.event/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.event/feature.xml
rename to features/src/main/javascript/features/core.util.event/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.util.onload/feature.xml b/features/src/main/javascript/features/core.util.onload/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.onload/feature.xml
rename to features/src/main/javascript/features/core.util.onload/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.util.onload/onload.js b/features/src/main/javascript/features/core.util.onload/onload.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.onload/onload.js
rename to features/src/main/javascript/features/core.util.onload/onload.js
diff --git a/trunk/features/src/main/javascript/features/core.util.onload/taming.js b/features/src/main/javascript/features/core.util.onload/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.onload/taming.js
rename to features/src/main/javascript/features/core.util.onload/taming.js
diff --git a/trunk/features/src/main/javascript/features/core.util.string/feature.xml b/features/src/main/javascript/features/core.util.string/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.string/feature.xml
rename to features/src/main/javascript/features/core.util.string/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.util.string/string.js b/features/src/main/javascript/features/core.util.string/string.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.string/string.js
rename to features/src/main/javascript/features/core.util.string/string.js
diff --git a/trunk/features/src/main/javascript/features/core.util.string/taming.js b/features/src/main/javascript/features/core.util.string/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.string/taming.js
rename to features/src/main/javascript/features/core.util.string/taming.js
diff --git a/trunk/features/src/main/javascript/features/core.util.urlparams/feature.xml b/features/src/main/javascript/features/core.util.urlparams/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.urlparams/feature.xml
rename to features/src/main/javascript/features/core.util.urlparams/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.util.urlparams/taming.js b/features/src/main/javascript/features/core.util.urlparams/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.urlparams/taming.js
rename to features/src/main/javascript/features/core.util.urlparams/taming.js
diff --git a/trunk/features/src/main/javascript/features/core.util.urlparams/urlparams.js b/features/src/main/javascript/features/core.util.urlparams/urlparams.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util.urlparams/urlparams.js
rename to features/src/main/javascript/features/core.util.urlparams/urlparams.js
diff --git a/trunk/features/src/main/javascript/features/core.util/feature.xml b/features/src/main/javascript/features/core.util/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util/feature.xml
rename to features/src/main/javascript/features/core.util/feature.xml
diff --git a/trunk/features/src/main/javascript/features/core.util/taming.js b/features/src/main/javascript/features/core.util/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util/taming.js
rename to features/src/main/javascript/features/core.util/taming.js
diff --git a/trunk/features/src/main/javascript/features/core.util/util.js b/features/src/main/javascript/features/core.util/util.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/core.util/util.js
rename to features/src/main/javascript/features/core.util/util.js
diff --git a/trunk/features/src/main/javascript/features/core/feature.xml b/features/src/main/javascript/features/core/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/core/feature.xml
rename to features/src/main/javascript/features/core/feature.xml
diff --git a/trunk/features/src/main/javascript/features/defer.test/defertest.js b/features/src/main/javascript/features/defer.test/defertest.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/defer.test/defertest.js
rename to features/src/main/javascript/features/defer.test/defertest.js
diff --git a/trunk/features/src/main/javascript/features/defer.test/feature.xml b/features/src/main/javascript/features/defer.test/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/defer.test/feature.xml
rename to features/src/main/javascript/features/defer.test/feature.xml
diff --git a/trunk/features/src/main/javascript/features/deferjs/deferjs.js b/features/src/main/javascript/features/deferjs/deferjs.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/deferjs/deferjs.js
rename to features/src/main/javascript/features/deferjs/deferjs.js
diff --git a/trunk/features/src/main/javascript/features/deferjs/feature.xml b/features/src/main/javascript/features/deferjs/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/deferjs/feature.xml
rename to features/src/main/javascript/features/deferjs/feature.xml
diff --git a/trunk/features/src/main/javascript/features/domnode/constants.js b/features/src/main/javascript/features/domnode/constants.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/domnode/constants.js
rename to features/src/main/javascript/features/domnode/constants.js
diff --git a/trunk/features/src/main/javascript/features/domnode/feature.xml b/features/src/main/javascript/features/domnode/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/domnode/feature.xml
rename to features/src/main/javascript/features/domnode/feature.xml
diff --git a/trunk/features/src/main/javascript/features/dynamic-height.height/dynamic-height-height.js b/features/src/main/javascript/features/dynamic-height.height/dynamic-height-height.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-height.height/dynamic-height-height.js
rename to features/src/main/javascript/features/dynamic-height.height/dynamic-height-height.js
diff --git a/trunk/features/src/main/javascript/features/dynamic-height.height/feature.xml b/features/src/main/javascript/features/dynamic-height.height/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-height.height/feature.xml
rename to features/src/main/javascript/features/dynamic-height.height/feature.xml
diff --git a/trunk/features/src/main/javascript/features/dynamic-height.height/taming.js b/features/src/main/javascript/features/dynamic-height.height/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-height.height/taming.js
rename to features/src/main/javascript/features/dynamic-height.height/taming.js
diff --git a/trunk/features/src/main/javascript/features/dynamic-height/dynamic-height.js b/features/src/main/javascript/features/dynamic-height/dynamic-height.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-height/dynamic-height.js
rename to features/src/main/javascript/features/dynamic-height/dynamic-height.js
diff --git a/trunk/features/src/main/javascript/features/dynamic-height/feature.xml b/features/src/main/javascript/features/dynamic-height/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-height/feature.xml
rename to features/src/main/javascript/features/dynamic-height/feature.xml
diff --git a/trunk/features/src/main/javascript/features/dynamic-height/taming.js b/features/src/main/javascript/features/dynamic-height/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-height/taming.js
rename to features/src/main/javascript/features/dynamic-height/taming.js
diff --git a/trunk/features/src/main/javascript/features/dynamic-size.util/dynamic-size-util.js b/features/src/main/javascript/features/dynamic-size.util/dynamic-size-util.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-size.util/dynamic-size-util.js
rename to features/src/main/javascript/features/dynamic-size.util/dynamic-size-util.js
diff --git a/trunk/features/src/main/javascript/features/dynamic-size.util/feature.xml b/features/src/main/javascript/features/dynamic-size.util/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-size.util/feature.xml
rename to features/src/main/javascript/features/dynamic-size.util/feature.xml
diff --git a/trunk/features/src/main/javascript/features/dynamic-size.util/taming.js b/features/src/main/javascript/features/dynamic-size.util/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-size.util/taming.js
rename to features/src/main/javascript/features/dynamic-size.util/taming.js
diff --git a/trunk/features/src/main/javascript/features/dynamic-width.width/dynamic-width-width.js b/features/src/main/javascript/features/dynamic-width.width/dynamic-width-width.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-width.width/dynamic-width-width.js
rename to features/src/main/javascript/features/dynamic-width.width/dynamic-width-width.js
diff --git a/trunk/features/src/main/javascript/features/dynamic-width.width/feature.xml b/features/src/main/javascript/features/dynamic-width.width/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-width.width/feature.xml
rename to features/src/main/javascript/features/dynamic-width.width/feature.xml
diff --git a/trunk/features/src/main/javascript/features/dynamic-width.width/taming.js b/features/src/main/javascript/features/dynamic-width.width/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-width.width/taming.js
rename to features/src/main/javascript/features/dynamic-width.width/taming.js
diff --git a/trunk/features/src/main/javascript/features/dynamic-width/dynamic-width.js b/features/src/main/javascript/features/dynamic-width/dynamic-width.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-width/dynamic-width.js
rename to features/src/main/javascript/features/dynamic-width/dynamic-width.js
diff --git a/trunk/features/src/main/javascript/features/dynamic-width/feature.xml b/features/src/main/javascript/features/dynamic-width/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-width/feature.xml
rename to features/src/main/javascript/features/dynamic-width/feature.xml
diff --git a/trunk/features/src/main/javascript/features/dynamic-width/taming.js b/features/src/main/javascript/features/dynamic-width/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/dynamic-width/taming.js
rename to features/src/main/javascript/features/dynamic-width/taming.js
diff --git a/trunk/features/src/main/javascript/features/embeddedexperiences/constant.js b/features/src/main/javascript/features/embeddedexperiences/constant.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/embeddedexperiences/constant.js
rename to features/src/main/javascript/features/embeddedexperiences/constant.js
diff --git a/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_container.js b/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_container.js
rename to features/src/main/javascript/features/embeddedexperiences/embedded_experiences_container.js
diff --git a/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_gadgets.js b/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_gadgets.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_gadgets.js
rename to features/src/main/javascript/features/embeddedexperiences/embedded_experiences_gadgets.js
diff --git a/trunk/features/src/main/javascript/features/embeddedexperiences/feature.xml b/features/src/main/javascript/features/embeddedexperiences/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/embeddedexperiences/feature.xml
rename to features/src/main/javascript/features/embeddedexperiences/feature.xml
diff --git a/trunk/features/src/main/javascript/features/exportjs/exportjs.js b/features/src/main/javascript/features/exportjs/exportjs.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/exportjs/exportjs.js
rename to features/src/main/javascript/features/exportjs/exportjs.js
diff --git a/trunk/features/src/main/javascript/features/exportjs/feature.xml b/features/src/main/javascript/features/exportjs/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/exportjs/feature.xml
rename to features/src/main/javascript/features/exportjs/feature.xml
diff --git a/trunk/features/src/main/javascript/features/features.txt b/features/src/main/javascript/features/features.txt
similarity index 100%
rename from trunk/features/src/main/javascript/features/features.txt
rename to features/src/main/javascript/features/features.txt
diff --git a/trunk/features/src/main/javascript/features/flash/feature.xml b/features/src/main/javascript/features/flash/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/flash/feature.xml
rename to features/src/main/javascript/features/flash/feature.xml
diff --git a/trunk/features/src/main/javascript/features/flash/flash.js b/features/src/main/javascript/features/flash/flash.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/flash/flash.js
rename to features/src/main/javascript/features/flash/flash.js
diff --git a/trunk/features/src/main/javascript/features/flash/taming.js b/features/src/main/javascript/features/flash/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/flash/taming.js
rename to features/src/main/javascript/features/flash/taming.js
diff --git a/trunk/features/src/main/javascript/features/gadgets.json.ext/feature.xml b/features/src/main/javascript/features/gadgets.json.ext/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/gadgets.json.ext/feature.xml
rename to features/src/main/javascript/features/gadgets.json.ext/feature.xml
diff --git a/trunk/features/src/main/javascript/features/gadgets.json.ext/json-xmltojson.js b/features/src/main/javascript/features/gadgets.json.ext/json-xmltojson.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/gadgets.json.ext/json-xmltojson.js
rename to features/src/main/javascript/features/gadgets.json.ext/json-xmltojson.js
diff --git a/trunk/features/src/main/javascript/features/gadgets.json.ext/taming.js b/features/src/main/javascript/features/gadgets.json.ext/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/gadgets.json.ext/taming.js
rename to features/src/main/javascript/features/gadgets.json.ext/taming.js
diff --git a/trunk/features/src/main/javascript/features/globals/feature.xml b/features/src/main/javascript/features/globals/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/globals/feature.xml
rename to features/src/main/javascript/features/globals/feature.xml
diff --git a/trunk/features/src/main/javascript/features/globals/globals.js b/features/src/main/javascript/features/globals/globals.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/globals/globals.js
rename to features/src/main/javascript/features/globals/globals.js
diff --git a/trunk/features/src/main/javascript/features/i18n/currencycodemap.js b/features/src/main/javascript/features/i18n/currencycodemap.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/currencycodemap.js
rename to features/src/main/javascript/features/i18n/currencycodemap.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__aa.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_DJ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_DJ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_DJ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_DJ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ER.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ER.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ER.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ER.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ER_SAAHO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ER_SAAHO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ER_SAAHO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ER_SAAHO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ET.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ET.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__aa_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__af.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__af.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__af.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__af.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__af_NA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__af_NA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__af_NA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__af_NA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__af_ZA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__af_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__af_ZA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__af_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ak.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ak.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ak.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ak.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ak_GH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ak_GH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ak_GH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ak_GH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__am.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__am.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__am.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__am.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__am_ET.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__am_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__am_ET.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__am_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_AE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_AE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_AE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_AE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_BH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_BH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_BH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_BH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_DZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_DZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_DZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_DZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_EG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_EG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_EG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_EG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_IQ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_IQ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_IQ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_IQ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_JO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_JO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_JO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_JO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_KW.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_KW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_KW.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_KW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_LB.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_LB.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_LB.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_LB.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_LY.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_LY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_LY.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_LY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_MA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_MA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_MA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_MA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_OM.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_OM.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_OM.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_OM.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_QA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_QA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_QA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_QA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SD.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SD.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SY.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SY.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_SY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_TN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_TN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_TN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_TN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_YE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_YE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_YE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ar_YE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__as.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__as.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__as.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__as.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__as_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__as_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__as_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__as_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__az.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__az.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_AZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_AZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_AZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__az_AZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Cyrl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Cyrl_AZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Cyrl_AZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Cyrl_AZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Cyrl_AZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Latn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Latn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Latn_AZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Latn_AZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Latn_AZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__az_Latn_AZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__be.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__be.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__be.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__be.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__be_BY.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__be_BY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__be_BY.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__be_BY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bg.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__bg.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bg.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__bg.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bg_BG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__bg_BG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bg_BG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__bg_BG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__bn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__bn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bn_BD.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__bn_BD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bn_BD.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__bn_BD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bn_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__bn_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bn_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__bn_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bo.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__bo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bo.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__bo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bo_CN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__bo_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bo_CN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__bo_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bo_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__bo_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bo_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__bo_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bs.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__bs.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bs.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__bs.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bs_BA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__bs_BA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__bs_BA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__bs_BA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__byn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__byn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__byn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__byn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__byn_ER.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__byn_ER.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__byn_ER.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__byn_ER.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ca.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ca.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ca.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ca.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ca_ES.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ca_ES.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ca_ES.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ca_ES.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cch.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__cch.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cch.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__cch.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cch_NG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__cch_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cch_NG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__cch_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cop.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__cop.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cop.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__cop.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cs.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__cs.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cs.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__cs.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cs_CZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__cs_CZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cs_CZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__cs_CZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cy.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__cy.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cy.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__cy.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cy_GB.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__cy_GB.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__cy_GB.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__cy_GB.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__da.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__da.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__da.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__da.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__da_DK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__da_DK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__da_DK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__da_DK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__de.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__de.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_AT.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_AT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_AT.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__de_AT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_BE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_BE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_BE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__de_BE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_CH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_CH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_CH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__de_CH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_DE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_DE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_DE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__de_DE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_LI.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_LI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_LI.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__de_LI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_LU.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_LU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__de_LU.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__de_LU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__dv.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__dv.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__dv.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__dv.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__dv_MV.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__dv_MV.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__dv_MV.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__dv_MV.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__dz.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__dz.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__dz.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__dz.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__dz_BT.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__dz_BT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__dz_BT.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__dz_BT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ee.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ee.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ee.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ee.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ee_GH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ee_GH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ee_GH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ee_GH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ee_TG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ee_TG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ee_TG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ee_TG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__el.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__el.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__el.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__el.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__el_CY.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__el_CY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__el_CY.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__el_CY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__el_GR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__el_GR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__el_GR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__el_GR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__el_POLYTON.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__el_POLYTON.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__el_POLYTON.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__el_POLYTON.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_AS.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_AS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_AS.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_AS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_AU.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_AU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_AU.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_AU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BW.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BW.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_BZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_CA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_CA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_CA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_CA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Dsrt.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Dsrt.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Dsrt.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Dsrt.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Dsrt_US.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Dsrt_US.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Dsrt_US.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Dsrt_US.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_GB.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_GB.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_GB.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_GB.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_GU.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_GU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_GU.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_GU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_HK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_HK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_HK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_HK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_IE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_IE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_IE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_IE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_JM.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_JM.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_JM.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_JM.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MP.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MP.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MP.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MP.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MT.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MT.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_MT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_NA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_NA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_NA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_NA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_NZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_NZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_NZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_NZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_PH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_PH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_PH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_PH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_PK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_PK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_PK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_PK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_SG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_SG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_SG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_SG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Shaw.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Shaw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Shaw.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_Shaw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_TT.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_TT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_TT.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_TT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_UM.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_UM.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_UM.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_UM.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_US.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_US.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_US.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_US.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_VI.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_VI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_VI.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_VI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_ZA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_ZA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_ZW.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_ZW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__en_ZW.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__en_ZW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__eo.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__eo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__eo.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__eo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_AR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_AR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_AR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_AR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_BO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_BO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_BO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_BO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CL.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CL.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_CR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_DO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_DO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_DO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_DO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_EC.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_EC.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_EC.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_EC.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_ES.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_ES.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_ES.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_ES.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_GT.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_GT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_GT.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_GT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_HN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_HN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_HN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_HN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_MX.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_MX.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_MX.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_MX.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_NI.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_NI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_NI.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_NI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PY.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PY.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_PY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_SV.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_SV.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_SV.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_SV.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_US.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_US.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_US.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_US.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_UY.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_UY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_UY.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_UY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_VE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_VE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__es_VE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__es_VE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__et.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__et.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__et.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__et.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__et_EE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__et_EE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__et_EE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__et_EE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__eu.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__eu.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__eu.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__eu.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__eu_ES.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__eu_ES.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__eu_ES.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__eu_ES.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fa.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fa.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fa.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fa.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fa_AF.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fa_AF.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fa_AF.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fa_AF.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fa_IR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fa_IR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fa_IR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fa_IR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fi.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fi.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fi.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fi.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fi_FI.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fi_FI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fi_FI.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fi_FI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fil.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fil.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fil.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fil.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fil_PH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fil_PH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fil_PH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fil_PH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fo.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fo.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fo_FO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fo_FO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fo_FO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fo_FO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_BE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_BE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_BE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_BE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_CA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_CA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_CA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_CA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_CH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_CH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_CH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_CH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_FR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_FR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_FR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_FR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_LU.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_LU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_LU.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_LU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_MC.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_MC.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_MC.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_MC.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_SN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_SN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_SN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fr_SN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fur.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fur.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fur.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fur.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fur_IT.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__fur_IT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__fur_IT.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__fur_IT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ga.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ga.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ga.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ga.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ga_IE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ga_IE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ga_IE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ga_IE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gaa.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gaa.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gaa.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gaa.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gaa_GH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gaa_GH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gaa_GH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gaa_GH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gez.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gez.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gez.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gez.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gez_ER.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gez_ER.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gez_ER.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gez_ER.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gez_ET.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gez_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gez_ET.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gez_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gl_ES.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gl_ES.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gl_ES.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gl_ES.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gsw.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gsw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gsw.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gsw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gsw_CH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gsw_CH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gsw_CH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gsw_CH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gu.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gu.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gu.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gu.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gu_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gu_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gu_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gu_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gv.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gv.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gv.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gv.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gv_GB.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__gv_GB.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__gv_GB.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__gv_GB.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab_NG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab_NG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab_SD.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab_SD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab_SD.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Arab_SD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_GH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_GH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_GH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_GH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_GH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_GH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_GH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_GH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_NE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_NE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_NE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_NE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_NG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_NG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_Latn_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_NE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_NE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_NE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_NE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_NG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_NG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_SD.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_SD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_SD.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ha_SD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__haw.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__haw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__haw.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__haw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__haw_US.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__haw_US.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__haw_US.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__haw_US.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__he.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__he.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__he.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__he.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__he_IL.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__he_IL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__he_IL.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__he_IL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hi.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__hi.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hi.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__hi.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hi_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__hi_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hi_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__hi_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hr.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__hr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hr.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__hr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hr_HR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__hr_HR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hr_HR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__hr_HR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hu.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__hu.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hu.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__hu.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hu_HU.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__hu_HU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hu_HU.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__hu_HU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hy.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__hy.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hy.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__hy.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hy_AM.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__hy_AM.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__hy_AM.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__hy_AM.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ia.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ia.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ia.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ia.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__id.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__id.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__id.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__id.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__id_ID.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__id_ID.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__id_ID.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__id_ID.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ig.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ig.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ig.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ig.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ig_NG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ig_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ig_NG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ig_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ii.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ii.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ii.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ii.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ii_CN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ii_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ii_CN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ii_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__in.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__in.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__in.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__in.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__is.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__is.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__is.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__is.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__is_IS.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__is_IS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__is_IS.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__is_IS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__it.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__it.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__it.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__it.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__it_CH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__it_CH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__it_CH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__it_CH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__it_IT.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__it_IT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__it_IT.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__it_IT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__iu.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__iu.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__iu.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__iu.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__iw.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__iw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__iw.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__iw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ja.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ja.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ja.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ja.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ja_JP.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ja_JP.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ja_JP.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ja_JP.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ka.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ka.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ka.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ka.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ka_GE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ka_GE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ka_GE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ka_GE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kaj.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kaj.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kaj.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kaj.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kaj_NG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kaj_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kaj_NG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kaj_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kam.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kam.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kam.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kam.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kam_KE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kam_KE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kam_KE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kam_KE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kcg.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kcg.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kcg.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kcg.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kcg_NG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kcg_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kcg_NG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kcg_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kfo.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kfo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kfo.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kfo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kfo_CI.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kfo_CI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kfo_CI.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kfo_CI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kk.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_Cyrl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_Cyrl_KZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_Cyrl_KZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_Cyrl_KZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_Cyrl_KZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_KZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_KZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_KZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kk_KZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kl_GL.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kl_GL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kl_GL.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kl_GL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__km.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__km.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__km.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__km.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__km_KH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__km_KH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__km_KH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__km_KH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kn_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kn_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kn_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kn_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ko.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ko.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ko.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ko.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ko_KR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ko_KR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ko_KR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ko_KR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kok.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kok.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kok.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kok.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kok_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kok_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kok_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kok_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe_GN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe_GN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe_GN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe_GN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe_LR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe_LR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe_LR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kpe_LR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ku.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Arab.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Arab.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Arab.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Arab.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_IQ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_IQ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_IQ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_IQ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_IR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_IR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_IR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_IR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Latn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Latn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Latn_TR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Latn_TR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Latn_TR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_Latn_TR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_SY.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_SY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_SY.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_SY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_TR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_TR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_TR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ku_TR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kw.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kw.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kw_GB.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__kw_GB.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__kw_GB.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__kw_GB.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ky.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ky.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ky.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ky.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ky_KG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ky_KG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ky_KG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ky_KG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ln.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ln.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ln.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ln.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ln_CD.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ln_CD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ln_CD.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ln_CD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ln_CG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ln_CG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ln_CG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ln_CG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lo.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__lo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lo.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__lo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lo_LA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__lo_LA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lo_LA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__lo_LA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lt.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__lt.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lt.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__lt.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lt_LT.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__lt_LT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lt_LT.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__lt_LT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lv.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__lv.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lv.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__lv.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lv_LV.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__lv_LV.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__lv_LV.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__lv_LV.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mk.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mk.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mk.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mk.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mk_MK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mk_MK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mk_MK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mk_MK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ml.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ml.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ml.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ml.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ml_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ml_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ml_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ml_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_CN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_CN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Cyrl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Cyrl_MN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Cyrl_MN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Cyrl_MN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Cyrl_MN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_MN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_MN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_MN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_MN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Mong.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Mong.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Mong.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Mong.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Mong_CN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Mong_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Mong_CN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mn_Mong_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mo.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mo.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mr.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mr.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mr_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mr_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mr_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mr_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ms.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ms.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ms.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ms.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ms_BN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ms_BN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ms_BN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ms_BN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ms_MY.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ms_MY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ms_MY.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ms_MY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mt.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mt.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mt.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mt.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mt_MT.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__mt_MT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__mt_MT.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__mt_MT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__my.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__my.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__my.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__my.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__my_MM.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__my_MM.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__my_MM.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__my_MM.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nb.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nb.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nb.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nb.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nb_NO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nb_NO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nb_NO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nb_NO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nds.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nds.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nds.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nds.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nds_DE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nds_DE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nds_DE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nds_DE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ne.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ne.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ne.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ne.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ne_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ne_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ne_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ne_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ne_NP.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ne_NP.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ne_NP.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ne_NP.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nl_BE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nl_BE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nl_BE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nl_BE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nl_NL.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nl_NL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nl_NL.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nl_NL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nn_NO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nn_NO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nn_NO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nn_NO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__no.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__no.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__no.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__no.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nr.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nr.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nr_ZA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nr_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nr_ZA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nr_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nso.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nso.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nso.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nso.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nso_ZA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__nso_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__nso_ZA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__nso_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ny.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ny.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ny.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ny.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ny_MW.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ny_MW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ny_MW.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ny_MW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__oc.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__oc.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__oc.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__oc.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__oc_FR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__oc_FR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__oc_FR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__oc_FR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__om.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__om.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__om.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__om.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__om_ET.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__om_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__om_ET.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__om_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__om_KE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__om_KE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__om_KE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__om_KE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__or.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__or.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__or.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__or.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__or_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__or_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__or_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__or_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pa.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Arab.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Arab.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Arab.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Arab.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Arab_PK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Arab_PK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Arab_PK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Arab_PK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Guru.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Guru.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Guru.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Guru.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Guru_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Guru_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Guru_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_Guru_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_PK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_PK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_PK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pa_PK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pl_PL.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pl_PL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pl_PL.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pl_PL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ps.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ps.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ps.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ps.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ps_AF.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ps_AF.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ps_AF.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ps_AF.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pt.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pt.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pt.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pt.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pt_BR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pt_BR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pt_BR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pt_BR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pt_PT.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__pt_PT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__pt_PT.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__pt_PT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ro.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ro.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ro.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ro.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ro_MD.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ro_MD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ro_MD.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ro_MD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ro_RO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ro_RO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ro_RO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ro_RO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ru.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ru.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ru.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ru.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ru_RU.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ru_RU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ru_RU.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ru_RU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ru_UA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ru_UA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ru_UA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ru_UA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__rw.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__rw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__rw.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__rw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__rw_RW.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__rw_RW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__rw_RW.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__rw_RW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sa.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sa.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sa.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sa.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sa_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sa_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sa_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sa_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__se.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__se.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__se.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__se.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__se_FI.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__se_FI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__se_FI.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__se_FI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__se_NO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__se_NO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__se_NO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__se_NO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sh.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_BA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_BA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_BA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_BA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_CS.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_CS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_CS.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_CS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_YU.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_YU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_YU.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sh_YU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__si.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__si.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__si.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__si.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__si_LK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__si_LK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__si_LK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__si_LK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sid.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sid.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sid.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sid.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sid_ET.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sid_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sid_ET.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sid_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sk.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sk.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sk.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sk.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sk_SK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sk_SK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sk_SK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sk_SK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sl_SI.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sl_SI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sl_SI.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sl_SI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__so.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__so.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__so.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__so.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_DJ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_DJ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_DJ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__so_DJ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_ET.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_ET.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__so_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_KE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_KE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_KE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__so_KE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_SO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_SO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__so_SO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__so_SO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sq.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sq.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sq.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sq.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sq_AL.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sq_AL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sq_AL.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sq_AL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_BA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_BA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_BA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_BA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_CS.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_CS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_CS.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_CS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_BA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_BA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_BA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_BA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_CS.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_CS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_CS.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_CS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_ME.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_ME.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_ME.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_ME.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_RS.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_RS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_RS.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_RS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_YU.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_YU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_YU.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Cyrl_YU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_BA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_BA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_BA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_BA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_CS.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_CS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_CS.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_CS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_ME.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_ME.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_ME.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_ME.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_RS.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_RS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_RS.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_RS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_YU.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_YU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_YU.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_Latn_YU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_ME.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_ME.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_ME.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_ME.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_RS.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_RS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_RS.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_RS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_YU.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_YU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_YU.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sr_YU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ss.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ss.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ss.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ss.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ss_SZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ss_SZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ss_SZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ss_SZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ss_ZA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ss_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ss_ZA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ss_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__st.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__st.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__st.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__st.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__st_LS.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__st_LS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__st_LS.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__st_LS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__st_ZA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__st_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__st_ZA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__st_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sv.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sv.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sv.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sv.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sv_FI.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sv_FI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sv_FI.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sv_FI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sv_SE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sv_SE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sv_SE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sv_SE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sw.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sw.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sw_KE.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sw_KE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sw_KE.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sw_KE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sw_TZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__sw_TZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__sw_TZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__sw_TZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__syr.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__syr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__syr.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__syr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__syr_SY.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__syr_SY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__syr_SY.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__syr_SY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ta.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ta.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ta.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ta.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ta_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ta_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ta_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ta_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__te.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__te.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__te.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__te.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__te_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__te_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__te_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__te_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tg.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_Cyrl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_Cyrl_TJ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_Cyrl_TJ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_Cyrl_TJ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_Cyrl_TJ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_TJ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_TJ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_TJ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tg_TJ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__th.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__th.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__th.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__th.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__th_TH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__th_TH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__th_TH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__th_TH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ti.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ti.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ti.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ti.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ti_ER.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ti_ER.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ti_ER.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ti_ER.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ti_ET.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ti_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ti_ET.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ti_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tig.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tig.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tig.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tig.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tig_ER.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tig_ER.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tig_ER.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tig_ER.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tl_PH.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tl_PH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tl_PH.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tl_PH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tn_ZA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tn_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tn_ZA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tn_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__to.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__to.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__to.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__to.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__to_TO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__to_TO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__to_TO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__to_TO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tr.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tr.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tr_TR.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tr_TR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tr_TR.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tr_TR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__trv.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__trv.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__trv.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__trv.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__trv_TW.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__trv_TW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__trv_TW.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__trv_TW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ts.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ts.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ts.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ts.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ts_ZA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ts_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ts_ZA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ts_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tt.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tt.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tt.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tt.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tt_RU.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__tt_RU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__tt_RU.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__tt_RU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ug.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_Arab.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_Arab.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_Arab.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_Arab.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_Arab_CN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_Arab_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_Arab_CN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_Arab_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_CN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_CN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ug_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uk.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__uk.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uk.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__uk.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uk_UA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__uk_UA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uk_UA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__uk_UA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ur.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ur.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ur.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ur.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ur_IN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ur_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ur_IN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ur_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ur_PK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ur_PK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ur_PK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ur_PK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__uz.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_AF.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_AF.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_AF.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_AF.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Arab.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Arab.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Arab.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Arab.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Arab_AF.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Arab_AF.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Arab_AF.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Arab_AF.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Cyrl.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Cyrl_UZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Cyrl_UZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Cyrl_UZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Cyrl_UZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Latn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Latn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Latn_UZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Latn_UZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Latn_UZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_Latn_UZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_UZ.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_UZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_UZ.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__uz_UZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ve.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ve.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ve.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ve.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ve_ZA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__ve_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__ve_ZA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__ve_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__vi.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__vi.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__vi.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__vi.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__vi_VN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__vi_VN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__vi_VN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__vi_VN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wal.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__wal.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wal.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__wal.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wal_ET.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__wal_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wal_ET.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__wal_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__wo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_Latn.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_Latn.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_Latn_SN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_Latn_SN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_Latn_SN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_Latn_SN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_SN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_SN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_SN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__wo_SN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__xh.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__xh.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__xh.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__xh.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__xh_ZA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__xh_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__xh_ZA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__xh_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__yo.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__yo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__yo.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__yo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__yo_NG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__yo_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__yo_NG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__yo_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_CN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_CN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_HK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_HK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_HK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_HK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_CN.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_CN.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_HK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_HK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_HK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_HK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_MO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_MO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_MO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_MO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_SG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_SG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_SG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hans_SG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_HK.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_HK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_HK.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_HK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_MO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_MO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_MO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_MO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_TW.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_TW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_TW.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_Hant_TW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_MO.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_MO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_MO.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_MO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_SG.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_SG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_SG.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_SG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_TW.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_TW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_TW.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zh_TW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zu.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zu.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zu.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zu.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zu_ZA.js b/features/src/main/javascript/features/i18n/data/DateTimeConstants__zu_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/DateTimeConstants__zu_ZA.js
rename to features/src/main/javascript/features/i18n/data/DateTimeConstants__zu_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_DJ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_DJ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_DJ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_DJ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ER.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ER.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ER.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ER.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ER_SAAHO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ER_SAAHO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ER_SAAHO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ER_SAAHO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ET.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ET.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__aa_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__af.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__af.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__af.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__af.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__af_NA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__af_NA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__af_NA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__af_NA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__af_ZA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__af_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__af_ZA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__af_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ak.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ak.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ak.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ak.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ak_GH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ak_GH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ak_GH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ak_GH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__am.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__am.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__am.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__am.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__am_ET.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__am_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__am_ET.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__am_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_AE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_AE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_AE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_AE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_BH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_BH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_BH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_BH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_DZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_DZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_DZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_DZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_EG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_EG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_EG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_EG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_IQ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_IQ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_IQ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_IQ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_JO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_JO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_JO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_JO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_KW.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_KW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_KW.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_KW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_LB.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_LB.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_LB.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_LB.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_LY.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_LY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_LY.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_LY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_MA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_MA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_MA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_MA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_OM.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_OM.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_OM.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_OM.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_QA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_QA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_QA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_QA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SD.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SD.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SY.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SY.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_SY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_TN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_TN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_TN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_TN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_YE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_YE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_YE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ar_YE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__as.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__as.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__as.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__as.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__as_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__as_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__as_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__as_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__az.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_AZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_AZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_AZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_AZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Cyrl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Cyrl_AZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Cyrl_AZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Cyrl_AZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Cyrl_AZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Latn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Latn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Latn_AZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Latn_AZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Latn_AZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__az_Latn_AZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__be.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__be.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__be.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__be.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__be_BY.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__be_BY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__be_BY.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__be_BY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bg.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bg.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bg.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__bg.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bg_BG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bg_BG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bg_BG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__bg_BG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn_BD.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn_BD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn_BD.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn_BD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__bn_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo_CN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo_CN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__bo_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bs.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bs.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bs.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__bs.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bs_BA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bs_BA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__bs_BA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__bs_BA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__byn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__byn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__byn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__byn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__byn_ER.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__byn_ER.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__byn_ER.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__byn_ER.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ca.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ca.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ca.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ca.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ca_ES.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ca_ES.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ca_ES.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ca_ES.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cch.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cch.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cch.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__cch.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cch_NG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cch_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cch_NG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__cch_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cop.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cop.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cop.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__cop.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cs.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cs.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cs.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__cs.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cs_CZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cs_CZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cs_CZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__cs_CZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cy.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cy.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cy.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__cy.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cy_GB.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cy_GB.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__cy_GB.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__cy_GB.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__da.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__da.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__da.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__da.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__da_DK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__da_DK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__da_DK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__da_DK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__de.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_AT.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_AT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_AT.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_AT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_BE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_BE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_BE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_BE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_CH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_CH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_CH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_CH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_DE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_DE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_DE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_DE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_LI.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_LI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_LI.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_LI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_LU.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_LU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_LU.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__de_LU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dv.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dv.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dv.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__dv.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dv_MV.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dv_MV.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dv_MV.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__dv_MV.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dz.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dz.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dz.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__dz.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dz_BT.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dz_BT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__dz_BT.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__dz_BT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee_GH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee_GH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee_GH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee_GH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee_TG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee_TG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee_TG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ee_TG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__el.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_CY.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_CY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_CY.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_CY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_GR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_GR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_GR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_GR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_POLYTON.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_POLYTON.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_POLYTON.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__el_POLYTON.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_AS.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_AS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_AS.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_AS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_AU.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_AU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_AU.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_AU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BW.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BW.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_BZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_CA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_CA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_CA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_CA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Dsrt.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Dsrt.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Dsrt.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Dsrt.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Dsrt_US.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Dsrt_US.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Dsrt_US.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Dsrt_US.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_GB.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_GB.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_GB.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_GB.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_GU.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_GU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_GU.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_GU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_HK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_HK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_HK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_HK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_IE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_IE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_IE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_IE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_JM.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_JM.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_JM.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_JM.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MP.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MP.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MP.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MP.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MT.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MT.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_MT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_NA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_NA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_NA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_NA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_NZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_NZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_NZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_NZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_PH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_PH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_PH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_PH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_PK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_PK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_PK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_PK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_SG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_SG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_SG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_SG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Shaw.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Shaw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Shaw.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_Shaw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_TT.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_TT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_TT.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_TT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_UM.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_UM.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_UM.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_UM.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_US.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_US.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_US.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_US.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_VI.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_VI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_VI.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_VI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_ZA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_ZA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_ZW.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_ZW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_ZW.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__en_ZW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__eo.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__eo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__eo.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__eo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_AR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_AR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_AR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_AR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_BO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_BO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_BO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_BO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CL.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CL.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_CR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_DO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_DO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_DO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_DO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_EC.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_EC.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_EC.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_EC.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_ES.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_ES.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_ES.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_ES.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_GT.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_GT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_GT.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_GT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_HN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_HN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_HN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_HN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_MX.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_MX.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_MX.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_MX.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_NI.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_NI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_NI.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_NI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PY.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PY.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_PY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_SV.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_SV.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_SV.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_SV.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_US.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_US.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_US.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_US.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_UY.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_UY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_UY.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_UY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_VE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_VE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_VE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__es_VE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__et.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__et.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__et.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__et.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__et_EE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__et_EE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__et_EE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__et_EE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__eu.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__eu.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__eu.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__eu.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__eu_ES.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__eu_ES.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__eu_ES.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__eu_ES.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa_AF.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa_AF.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa_AF.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa_AF.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa_IR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa_IR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa_IR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fa_IR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fi.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fi.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fi.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fi.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fi_FI.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fi_FI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fi_FI.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fi_FI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fil.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fil.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fil.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fil.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fil_PH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fil_PH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fil_PH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fil_PH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fo.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fo.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fo_FO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fo_FO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fo_FO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fo_FO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_BE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_BE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_BE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_BE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_CA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_CA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_CA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_CA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_CH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_CH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_CH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_CH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_FR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_FR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_FR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_FR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_LU.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_LU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_LU.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_LU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_MC.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_MC.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_MC.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_MC.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_SN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_SN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_SN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fr_SN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fur.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fur.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fur.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fur.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fur_IT.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fur_IT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__fur_IT.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__fur_IT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ga.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ga.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ga.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ga.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ga_IE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ga_IE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ga_IE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ga_IE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gaa.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gaa.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gaa.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gaa.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gaa_GH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gaa_GH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gaa_GH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gaa_GH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez_ER.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez_ER.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez_ER.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez_ER.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez_ET.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez_ET.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gez_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gl_ES.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gl_ES.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gl_ES.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gl_ES.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gsw.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gsw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gsw.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gsw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gsw_CH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gsw_CH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gsw_CH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gsw_CH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gu.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gu.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gu.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gu.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gu_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gu_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gu_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gu_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gv.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gv.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gv.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gv.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gv_GB.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gv_GB.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__gv_GB.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__gv_GB.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab_NG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab_NG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab_SD.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab_SD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab_SD.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Arab_SD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_GH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_GH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_GH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_GH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_GH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_GH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_GH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_GH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_NE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_NE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_NE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_NE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_NG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_NG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_Latn_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_NE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_NE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_NE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_NE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_NG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_NG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_SD.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_SD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_SD.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ha_SD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__haw.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__haw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__haw.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__haw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__haw_US.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__haw_US.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__haw_US.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__haw_US.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__he.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__he.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__he.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__he.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__he_IL.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__he_IL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__he_IL.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__he_IL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hi.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hi.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hi.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__hi.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hi_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hi_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hi_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__hi_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hr.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hr.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__hr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hr_HR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hr_HR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hr_HR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__hr_HR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hu.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hu.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hu.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__hu.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hu_HU.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hu_HU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hu_HU.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__hu_HU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hy.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hy.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hy.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__hy.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hy_AM.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hy_AM.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__hy_AM.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__hy_AM.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ia.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ia.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ia.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ia.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__id.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__id.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__id.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__id.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__id_ID.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__id_ID.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__id_ID.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__id_ID.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ig.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ig.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ig.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ig.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ig_NG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ig_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ig_NG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ig_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ii.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ii.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ii.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ii.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ii_CN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ii_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ii_CN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ii_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__in.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__in.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__in.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__in.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__is.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__is.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__is.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__is.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__is_IS.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__is_IS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__is_IS.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__is_IS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__it.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__it.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__it.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__it.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__it_CH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__it_CH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__it_CH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__it_CH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__it_IT.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__it_IT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__it_IT.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__it_IT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__iu.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__iu.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__iu.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__iu.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__iw.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__iw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__iw.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__iw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ja.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ja.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ja.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ja.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ja_JP.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ja_JP.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ja_JP.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ja_JP.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ka.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ka.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ka.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ka.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ka_GE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ka_GE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ka_GE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ka_GE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kaj.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kaj.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kaj.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kaj.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kaj_NG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kaj_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kaj_NG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kaj_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kam.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kam.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kam.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kam.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kam_KE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kam_KE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kam_KE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kam_KE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kcg.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kcg.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kcg.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kcg.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kcg_NG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kcg_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kcg_NG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kcg_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kfo.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kfo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kfo.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kfo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kfo_CI.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kfo_CI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kfo_CI.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kfo_CI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_Cyrl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_Cyrl_KZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_Cyrl_KZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_Cyrl_KZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_Cyrl_KZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_KZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_KZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_KZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kk_KZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kl_GL.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kl_GL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kl_GL.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kl_GL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__km.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__km.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__km.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__km.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__km_KH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__km_KH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__km_KH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__km_KH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kn_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kn_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kn_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kn_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ko.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ko.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ko.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ko.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ko_KR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ko_KR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ko_KR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ko_KR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kok.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kok.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kok.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kok.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kok_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kok_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kok_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kok_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe_GN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe_GN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe_GN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe_GN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe_LR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe_LR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe_LR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kpe_LR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Arab.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Arab.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Arab.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Arab.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_IQ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_IQ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_IQ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_IQ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_IR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_IR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_IR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_IR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Latn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Latn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Latn_TR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Latn_TR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Latn_TR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_Latn_TR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_SY.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_SY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_SY.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_SY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_TR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_TR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_TR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ku_TR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kw.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kw.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kw_GB.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kw_GB.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__kw_GB.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__kw_GB.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ky.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ky.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ky.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ky.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ky_KG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ky_KG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ky_KG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ky_KG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln_CD.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln_CD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln_CD.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln_CD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln_CG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln_CG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln_CG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ln_CG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lo.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lo.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__lo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lo_LA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lo_LA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lo_LA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__lo_LA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lt.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lt.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lt.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__lt.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lt_LT.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lt_LT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lt_LT.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__lt_LT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lv.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lv.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lv.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__lv.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lv_LV.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lv_LV.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__lv_LV.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__lv_LV.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mk.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mk.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mk.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mk.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mk_MK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mk_MK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mk_MK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mk_MK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ml.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ml.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ml.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ml.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ml_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ml_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ml_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ml_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_CN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_CN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Cyrl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Cyrl_MN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Cyrl_MN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Cyrl_MN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Cyrl_MN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_MN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_MN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_MN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_MN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Mong.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Mong.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Mong.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Mong.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Mong_CN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Mong_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Mong_CN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mn_Mong_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mo.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mo.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mr.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mr.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mr_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mr_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mr_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mr_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms_BN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms_BN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms_BN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms_BN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms_MY.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms_MY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms_MY.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ms_MY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mt.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mt.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mt.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mt.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mt_MT.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mt_MT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__mt_MT.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__mt_MT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__my.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__my.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__my.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__my.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__my_MM.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__my_MM.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__my_MM.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__my_MM.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nb.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nb.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nb.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nb.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nb_NO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nb_NO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nb_NO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nb_NO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nds.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nds.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nds.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nds.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nds_DE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nds_DE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nds_DE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nds_DE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne_NP.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne_NP.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne_NP.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ne_NP.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl_BE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl_BE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl_BE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl_BE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl_NL.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl_NL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl_NL.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nl_NL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nn_NO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nn_NO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nn_NO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nn_NO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__no.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__no.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__no.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__no.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nr.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nr.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nr_ZA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nr_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nr_ZA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nr_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nso.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nso.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nso.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nso.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nso_ZA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nso_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__nso_ZA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__nso_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ny.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ny.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ny.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ny.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ny_MW.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ny_MW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ny_MW.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ny_MW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__oc.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__oc.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__oc.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__oc.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__oc_FR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__oc_FR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__oc_FR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__oc_FR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__om.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__om.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__om.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__om.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__om_ET.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__om_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__om_ET.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__om_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__om_KE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__om_KE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__om_KE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__om_KE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__or.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__or.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__or.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__or.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__or_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__or_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__or_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__or_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Arab.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Arab.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Arab.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Arab.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Arab_PK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Arab_PK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Arab_PK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Arab_PK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Guru.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Guru.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Guru.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Guru.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Guru_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Guru_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Guru_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_Guru_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_PK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_PK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_PK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pa_PK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pl_PL.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pl_PL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pl_PL.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pl_PL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ps.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ps.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ps.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ps.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ps_AF.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ps_AF.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ps_AF.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ps_AF.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt_BR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt_BR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt_BR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt_BR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt_PT.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt_PT.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt_PT.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__pt_PT.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro_MD.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro_MD.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro_MD.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro_MD.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro_RO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro_RO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro_RO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ro_RO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru_RU.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru_RU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru_RU.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru_RU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru_UA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru_UA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru_UA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ru_UA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__rw.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__rw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__rw.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__rw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__rw_RW.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__rw_RW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__rw_RW.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__rw_RW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sa.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sa.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sa.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sa.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sa_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sa_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sa_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sa_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__se.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__se.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__se.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__se.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__se_FI.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__se_FI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__se_FI.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__se_FI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__se_NO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__se_NO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__se_NO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__se_NO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_BA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_BA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_BA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_BA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_CS.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_CS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_CS.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_CS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_YU.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_YU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_YU.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sh_YU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__si.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__si.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__si.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__si.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__si_LK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__si_LK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__si_LK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__si_LK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sid.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sid.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sid.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sid.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sid_ET.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sid_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sid_ET.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sid_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sk.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sk.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sk.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sk.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sk_SK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sk_SK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sk_SK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sk_SK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sl_SI.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sl_SI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sl_SI.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sl_SI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__so.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_DJ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_DJ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_DJ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_DJ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_ET.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_ET.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_KE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_KE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_KE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_KE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_SO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_SO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_SO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__so_SO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sq.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sq.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sq.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sq.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sq_AL.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sq_AL.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sq_AL.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sq_AL.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_BA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_BA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_BA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_BA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_CS.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_CS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_CS.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_CS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_BA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_BA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_BA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_BA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_CS.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_CS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_CS.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_CS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_ME.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_ME.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_ME.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_ME.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_RS.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_RS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_RS.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_RS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_YU.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_YU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_YU.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Cyrl_YU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_BA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_BA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_BA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_BA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_CS.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_CS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_CS.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_CS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_ME.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_ME.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_ME.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_ME.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_RS.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_RS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_RS.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_RS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_YU.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_YU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_YU.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_Latn_YU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_ME.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_ME.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_ME.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_ME.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_RS.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_RS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_RS.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_RS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_YU.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_YU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_YU.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sr_YU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss_SZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss_SZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss_SZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss_SZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss_ZA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss_ZA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ss_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__st.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__st.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__st.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__st.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__st_LS.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__st_LS.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__st_LS.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__st_LS.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__st_ZA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__st_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__st_ZA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__st_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv_FI.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv_FI.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv_FI.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv_FI.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv_SE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv_SE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv_SE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sv_SE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw_KE.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw_KE.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw_KE.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw_KE.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw_TZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw_TZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw_TZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__sw_TZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__syr.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__syr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__syr.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__syr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__syr_SY.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__syr_SY.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__syr_SY.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__syr_SY.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ta.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ta.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ta.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ta.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ta_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ta_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ta_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ta_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__te.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__te.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__te.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__te.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__te_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__te_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__te_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__te_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_Cyrl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_Cyrl_TJ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_Cyrl_TJ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_Cyrl_TJ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_Cyrl_TJ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_TJ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_TJ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_TJ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tg_TJ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__th.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__th.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__th.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__th.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__th_TH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__th_TH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__th_TH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__th_TH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti_ER.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti_ER.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti_ER.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti_ER.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti_ET.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti_ET.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ti_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tig.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tig.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tig.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tig.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tig_ER.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tig_ER.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tig_ER.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tig_ER.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tl_PH.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tl_PH.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tl_PH.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tl_PH.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tn_ZA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tn_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tn_ZA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tn_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__to.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__to.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__to.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__to.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__to_TO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__to_TO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__to_TO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__to_TO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tr.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tr.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tr.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tr.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tr_TR.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tr_TR.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tr_TR.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tr_TR.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__trv.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__trv.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__trv.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__trv.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__trv_TW.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__trv_TW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__trv_TW.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__trv_TW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ts.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ts.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ts.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ts.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ts_ZA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ts_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ts_ZA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ts_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tt.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tt.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tt.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tt.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tt_RU.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tt_RU.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__tt_RU.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__tt_RU.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_Arab.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_Arab.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_Arab.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_Arab.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_Arab_CN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_Arab_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_Arab_CN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_Arab_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_CN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_CN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ug_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uk.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uk.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uk.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__uk.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uk_UA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uk_UA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uk_UA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__uk_UA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur_IN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur_IN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur_IN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur_IN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur_PK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur_PK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur_PK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ur_PK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_AF.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_AF.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_AF.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_AF.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Arab.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Arab.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Arab.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Arab.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Arab_AF.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Arab_AF.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Arab_AF.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Arab_AF.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Cyrl.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Cyrl.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Cyrl.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Cyrl.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Cyrl_UZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Cyrl_UZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Cyrl_UZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Cyrl_UZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Latn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Latn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Latn_UZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Latn_UZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Latn_UZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_Latn_UZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_UZ.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_UZ.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_UZ.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__uz_UZ.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ve.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ve.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ve.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ve.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ve_ZA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ve_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__ve_ZA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__ve_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__vi.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__vi.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__vi.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__vi.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__vi_VN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__vi_VN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__vi_VN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__vi_VN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wal.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wal.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wal.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__wal.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wal_ET.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wal_ET.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wal_ET.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__wal_ET.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_Latn.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_Latn.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_Latn.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_Latn.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_Latn_SN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_Latn_SN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_Latn_SN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_Latn_SN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_SN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_SN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_SN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__wo_SN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__xh.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__xh.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__xh.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__xh.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__xh_ZA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__xh_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__xh_ZA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__xh_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__yo.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__yo.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__yo.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__yo.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__yo_NG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__yo_NG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__yo_NG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__yo_NG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_CN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_CN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_HK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_HK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_HK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_HK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_CN.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_CN.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_CN.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_CN.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_HK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_HK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_HK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_HK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_MO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_MO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_MO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_MO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_SG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_SG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_SG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hans_SG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_HK.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_HK.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_HK.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_HK.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_MO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_MO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_MO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_MO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_TW.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_TW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_TW.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_Hant_TW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_MO.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_MO.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_MO.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_MO.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_SG.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_SG.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_SG.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_SG.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_TW.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_TW.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_TW.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zh_TW.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zu.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zu.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zu.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zu.js
diff --git a/trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zu_ZA.js b/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zu_ZA.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/data/NumberFormatConstants__zu_ZA.js
rename to features/src/main/javascript/features/i18n/data/NumberFormatConstants__zu_ZA.js
diff --git a/trunk/features/src/main/javascript/features/i18n/datetimeformat.js b/features/src/main/javascript/features/i18n/datetimeformat.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/datetimeformat.js
rename to features/src/main/javascript/features/i18n/datetimeformat.js
diff --git a/trunk/features/src/main/javascript/features/i18n/datetimeformattest.js b/features/src/main/javascript/features/i18n/datetimeformattest.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/datetimeformattest.js
rename to features/src/main/javascript/features/i18n/datetimeformattest.js
diff --git a/trunk/features/src/main/javascript/features/i18n/datetimeparse.js b/features/src/main/javascript/features/i18n/datetimeparse.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/datetimeparse.js
rename to features/src/main/javascript/features/i18n/datetimeparse.js
diff --git a/trunk/features/src/main/javascript/features/i18n/datetimeparsetest.js b/features/src/main/javascript/features/i18n/datetimeparsetest.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/datetimeparsetest.js
rename to features/src/main/javascript/features/i18n/datetimeparsetest.js
diff --git a/trunk/features/src/main/javascript/features/i18n/feature.xml b/features/src/main/javascript/features/i18n/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/feature.xml
rename to features/src/main/javascript/features/i18n/feature.xml
diff --git a/trunk/features/src/main/javascript/features/i18n/formatting.js b/features/src/main/javascript/features/i18n/formatting.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/formatting.js
rename to features/src/main/javascript/features/i18n/formatting.js
diff --git a/trunk/features/src/main/javascript/features/i18n/numberformat.js b/features/src/main/javascript/features/i18n/numberformat.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/numberformat.js
rename to features/src/main/javascript/features/i18n/numberformat.js
diff --git a/trunk/features/src/main/javascript/features/i18n/numberformattest.js b/features/src/main/javascript/features/i18n/numberformattest.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/i18n/numberformattest.js
rename to features/src/main/javascript/features/i18n/numberformattest.js
diff --git a/trunk/features/src/main/javascript/features/jsondom/feature.xml b/features/src/main/javascript/features/jsondom/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/jsondom/feature.xml
rename to features/src/main/javascript/features/jsondom/feature.xml
diff --git a/trunk/features/src/main/javascript/features/jsondom/jsondom.js b/features/src/main/javascript/features/jsondom/jsondom.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/jsondom/jsondom.js
rename to features/src/main/javascript/features/jsondom/jsondom.js
diff --git a/trunk/features/src/main/javascript/features/locked-domain/feature.xml b/features/src/main/javascript/features/locked-domain/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/locked-domain/feature.xml
rename to features/src/main/javascript/features/locked-domain/feature.xml
diff --git a/trunk/features/src/main/javascript/features/minimessage/feature.xml b/features/src/main/javascript/features/minimessage/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/minimessage/feature.xml
rename to features/src/main/javascript/features/minimessage/feature.xml
diff --git a/trunk/features/src/main/javascript/features/minimessage/minimessage.js b/features/src/main/javascript/features/minimessage/minimessage.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/minimessage/minimessage.js
rename to features/src/main/javascript/features/minimessage/minimessage.js
diff --git a/trunk/features/src/main/javascript/features/minimessage/taming.js b/features/src/main/javascript/features/minimessage/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/minimessage/taming.js
rename to features/src/main/javascript/features/minimessage/taming.js
diff --git a/trunk/features/src/main/javascript/features/oauthpopup/feature.xml b/features/src/main/javascript/features/oauthpopup/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/oauthpopup/feature.xml
rename to features/src/main/javascript/features/oauthpopup/feature.xml
diff --git a/trunk/features/src/main/javascript/features/oauthpopup/oauthpopup.js b/features/src/main/javascript/features/oauthpopup/oauthpopup.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/oauthpopup/oauthpopup.js
rename to features/src/main/javascript/features/oauthpopup/oauthpopup.js
diff --git a/trunk/features/src/main/javascript/features/open-views.common/feature.xml b/features/src/main/javascript/features/open-views.common/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.common/feature.xml
rename to features/src/main/javascript/features/open-views.common/feature.xml
diff --git a/trunk/features/src/main/javascript/features/open-views.common/open-views-common-container.js b/features/src/main/javascript/features/open-views.common/open-views-common-container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.common/open-views-common-container.js
rename to features/src/main/javascript/features/open-views.common/open-views-common-container.js
diff --git a/trunk/features/src/main/javascript/features/open-views.common/open-views-common-gadget.js b/features/src/main/javascript/features/open-views.common/open-views-common-gadget.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.common/open-views-common-gadget.js
rename to features/src/main/javascript/features/open-views.common/open-views-common-gadget.js
diff --git a/trunk/features/src/main/javascript/features/open-views.ee/feature.xml b/features/src/main/javascript/features/open-views.ee/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.ee/feature.xml
rename to features/src/main/javascript/features/open-views.ee/feature.xml
diff --git a/trunk/features/src/main/javascript/features/open-views.ee/open-views-ee-container.js b/features/src/main/javascript/features/open-views.ee/open-views-ee-container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.ee/open-views-ee-container.js
rename to features/src/main/javascript/features/open-views.ee/open-views-ee-container.js
diff --git a/trunk/features/src/main/javascript/features/open-views.ee/open-views-ee-gadget.js b/features/src/main/javascript/features/open-views.ee/open-views-ee-gadget.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.ee/open-views-ee-gadget.js
rename to features/src/main/javascript/features/open-views.ee/open-views-ee-gadget.js
diff --git a/trunk/features/src/main/javascript/features/open-views.gadget/feature.xml b/features/src/main/javascript/features/open-views.gadget/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.gadget/feature.xml
rename to features/src/main/javascript/features/open-views.gadget/feature.xml
diff --git a/trunk/features/src/main/javascript/features/open-views.gadget/open-views-gadget-container.js b/features/src/main/javascript/features/open-views.gadget/open-views-gadget-container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.gadget/open-views-gadget-container.js
rename to features/src/main/javascript/features/open-views.gadget/open-views-gadget-container.js
diff --git a/trunk/features/src/main/javascript/features/open-views.gadget/open-views-gadget-gadget.js b/features/src/main/javascript/features/open-views.gadget/open-views-gadget-gadget.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.gadget/open-views-gadget-gadget.js
rename to features/src/main/javascript/features/open-views.gadget/open-views-gadget-gadget.js
diff --git a/trunk/features/src/main/javascript/features/open-views.results/feature.xml b/features/src/main/javascript/features/open-views.results/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.results/feature.xml
rename to features/src/main/javascript/features/open-views.results/feature.xml
diff --git a/trunk/features/src/main/javascript/features/open-views.results/open-views-results-container.js b/features/src/main/javascript/features/open-views.results/open-views-results-container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.results/open-views-results-container.js
rename to features/src/main/javascript/features/open-views.results/open-views-results-container.js
diff --git a/trunk/features/src/main/javascript/features/open-views.results/open-views-results-gadget.js b/features/src/main/javascript/features/open-views.results/open-views-results-gadget.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.results/open-views-results-gadget.js
rename to features/src/main/javascript/features/open-views.results/open-views-results-gadget.js
diff --git a/trunk/features/src/main/javascript/features/open-views.url/feature.xml b/features/src/main/javascript/features/open-views.url/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.url/feature.xml
rename to features/src/main/javascript/features/open-views.url/feature.xml
diff --git a/trunk/features/src/main/javascript/features/open-views.url/open-views-url-container.js b/features/src/main/javascript/features/open-views.url/open-views-url-container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.url/open-views-url-container.js
rename to features/src/main/javascript/features/open-views.url/open-views-url-container.js
diff --git a/trunk/features/src/main/javascript/features/open-views.url/open-views-url-gadget.js b/features/src/main/javascript/features/open-views.url/open-views-url-gadget.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views.url/open-views-url-gadget.js
rename to features/src/main/javascript/features/open-views.url/open-views-url-gadget.js
diff --git a/trunk/features/src/main/javascript/features/open-views/feature.xml b/features/src/main/javascript/features/open-views/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/open-views/feature.xml
rename to features/src/main/javascript/features/open-views/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensearch/feature.xml b/features/src/main/javascript/features/opensearch/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensearch/feature.xml
rename to features/src/main/javascript/features/opensearch/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensearch/opensearch.js b/features/src/main/javascript/features/opensearch/opensearch.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensearch/opensearch.js
rename to features/src/main/javascript/features/opensearch/opensearch.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-0.9/feature.xml b/features/src/main/javascript/features/opensocial-0.9/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-0.9/feature.xml
rename to features/src/main/javascript/features/opensocial-0.9/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensocial-1.0/feature.xml b/features/src/main/javascript/features/opensocial-1.0/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-1.0/feature.xml
rename to features/src/main/javascript/features/opensocial-1.0/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensocial-2.0/feature.xml b/features/src/main/javascript/features/opensocial-2.0/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-2.0/feature.xml
rename to features/src/main/javascript/features/opensocial-2.0/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensocial-2.5/feature.xml b/features/src/main/javascript/features/opensocial-2.5/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-2.5/feature.xml
rename to features/src/main/javascript/features/opensocial-2.5/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensocial-base/feature.xml b/features/src/main/javascript/features/opensocial-base/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-base/feature.xml
rename to features/src/main/javascript/features/opensocial-base/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensocial-base/fieldtranslations.js b/features/src/main/javascript/features/opensocial-base/fieldtranslations.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-base/fieldtranslations.js
rename to features/src/main/javascript/features/opensocial-base/fieldtranslations.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-base/jsonactivity.js b/features/src/main/javascript/features/opensocial-base/jsonactivity.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-base/jsonactivity.js
rename to features/src/main/javascript/features/opensocial-base/jsonactivity.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-base/jsonalbum.js b/features/src/main/javascript/features/opensocial-base/jsonalbum.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-base/jsonalbum.js
rename to features/src/main/javascript/features/opensocial-base/jsonalbum.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-base/jsonmediaitem.js b/features/src/main/javascript/features/opensocial-base/jsonmediaitem.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-base/jsonmediaitem.js
rename to features/src/main/javascript/features/opensocial-base/jsonmediaitem.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-base/jsonmessage.js b/features/src/main/javascript/features/opensocial-base/jsonmessage.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-base/jsonmessage.js
rename to features/src/main/javascript/features/opensocial-base/jsonmessage.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-base/jsonmessagecollection.js b/features/src/main/javascript/features/opensocial-base/jsonmessagecollection.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-base/jsonmessagecollection.js
rename to features/src/main/javascript/features/opensocial-base/jsonmessagecollection.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-base/jsonperson.js b/features/src/main/javascript/features/opensocial-base/jsonperson.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-base/jsonperson.js
rename to features/src/main/javascript/features/opensocial-base/jsonperson.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-base/taming.js b/features/src/main/javascript/features/opensocial-base/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-base/taming.js
rename to features/src/main/javascript/features/opensocial-base/taming.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-current/feature.xml b/features/src/main/javascript/features/opensocial-current/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-current/feature.xml
rename to features/src/main/javascript/features/opensocial-current/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensocial-data-context/datacontext.js b/features/src/main/javascript/features/opensocial-data-context/datacontext.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-data-context/datacontext.js
rename to features/src/main/javascript/features/opensocial-data-context/datacontext.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-data-context/feature.xml b/features/src/main/javascript/features/opensocial-data-context/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-data-context/feature.xml
rename to features/src/main/javascript/features/opensocial-data-context/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensocial-data-context/taming.js b/features/src/main/javascript/features/opensocial-data-context/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-data-context/taming.js
rename to features/src/main/javascript/features/opensocial-data-context/taming.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-data/data.js b/features/src/main/javascript/features/opensocial-data/data.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-data/data.js
rename to features/src/main/javascript/features/opensocial-data/data.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-data/feature.xml b/features/src/main/javascript/features/opensocial-data/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-data/feature.xml
rename to features/src/main/javascript/features/opensocial-data/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensocial-jsonrpc/feature.xml b/features/src/main/javascript/features/opensocial-jsonrpc/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-jsonrpc/feature.xml
rename to features/src/main/javascript/features/opensocial-jsonrpc/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js b/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js
rename to features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/activity.js b/features/src/main/javascript/features/opensocial-reference/activity.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/activity.js
rename to features/src/main/javascript/features/opensocial-reference/activity.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/address.js b/features/src/main/javascript/features/opensocial-reference/address.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/address.js
rename to features/src/main/javascript/features/opensocial-reference/address.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/album.js b/features/src/main/javascript/features/opensocial-reference/album.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/album.js
rename to features/src/main/javascript/features/opensocial-reference/album.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/bodytype.js b/features/src/main/javascript/features/opensocial-reference/bodytype.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/bodytype.js
rename to features/src/main/javascript/features/opensocial-reference/bodytype.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/collection.js b/features/src/main/javascript/features/opensocial-reference/collection.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/collection.js
rename to features/src/main/javascript/features/opensocial-reference/collection.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/container.js b/features/src/main/javascript/features/opensocial-reference/container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/container.js
rename to features/src/main/javascript/features/opensocial-reference/container.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/datarequest.js b/features/src/main/javascript/features/opensocial-reference/datarequest.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/datarequest.js
rename to features/src/main/javascript/features/opensocial-reference/datarequest.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/dataresponse.js b/features/src/main/javascript/features/opensocial-reference/dataresponse.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/dataresponse.js
rename to features/src/main/javascript/features/opensocial-reference/dataresponse.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/email.js b/features/src/main/javascript/features/opensocial-reference/email.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/email.js
rename to features/src/main/javascript/features/opensocial-reference/email.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/enum.js b/features/src/main/javascript/features/opensocial-reference/enum.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/enum.js
rename to features/src/main/javascript/features/opensocial-reference/enum.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/environment.js b/features/src/main/javascript/features/opensocial-reference/environment.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/environment.js
rename to features/src/main/javascript/features/opensocial-reference/environment.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/feature.xml b/features/src/main/javascript/features/opensocial-reference/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/feature.xml
rename to features/src/main/javascript/features/opensocial-reference/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/idspec.js b/features/src/main/javascript/features/opensocial-reference/idspec.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/idspec.js
rename to features/src/main/javascript/features/opensocial-reference/idspec.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/mediaitem.js b/features/src/main/javascript/features/opensocial-reference/mediaitem.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/mediaitem.js
rename to features/src/main/javascript/features/opensocial-reference/mediaitem.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/message.js b/features/src/main/javascript/features/opensocial-reference/message.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/message.js
rename to features/src/main/javascript/features/opensocial-reference/message.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/messagecollection.js b/features/src/main/javascript/features/opensocial-reference/messagecollection.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/messagecollection.js
rename to features/src/main/javascript/features/opensocial-reference/messagecollection.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/name.js b/features/src/main/javascript/features/opensocial-reference/name.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/name.js
rename to features/src/main/javascript/features/opensocial-reference/name.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/navigationparameters.js b/features/src/main/javascript/features/opensocial-reference/navigationparameters.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/navigationparameters.js
rename to features/src/main/javascript/features/opensocial-reference/navigationparameters.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/opensocial.js b/features/src/main/javascript/features/opensocial-reference/opensocial.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/opensocial.js
rename to features/src/main/javascript/features/opensocial-reference/opensocial.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/organization.js b/features/src/main/javascript/features/opensocial-reference/organization.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/organization.js
rename to features/src/main/javascript/features/opensocial-reference/organization.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/person.js b/features/src/main/javascript/features/opensocial-reference/person.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/person.js
rename to features/src/main/javascript/features/opensocial-reference/person.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/phone.js b/features/src/main/javascript/features/opensocial-reference/phone.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/phone.js
rename to features/src/main/javascript/features/opensocial-reference/phone.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/responseitem.js b/features/src/main/javascript/features/opensocial-reference/responseitem.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/responseitem.js
rename to features/src/main/javascript/features/opensocial-reference/responseitem.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/taming.js b/features/src/main/javascript/features/opensocial-reference/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/taming.js
rename to features/src/main/javascript/features/opensocial-reference/taming.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-reference/url.js b/features/src/main/javascript/features/opensocial-reference/url.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-reference/url.js
rename to features/src/main/javascript/features/opensocial-reference/url.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/README b/features/src/main/javascript/features/opensocial-templates/README
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/README
rename to features/src/main/javascript/features/opensocial-templates/README
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/base.js b/features/src/main/javascript/features/opensocial-templates/base.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/base.js
rename to features/src/main/javascript/features/opensocial-templates/base.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/compiler.js b/features/src/main/javascript/features/opensocial-templates/compiler.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/compiler.js
rename to features/src/main/javascript/features/opensocial-templates/compiler.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/container.js b/features/src/main/javascript/features/opensocial-templates/container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/container.js
rename to features/src/main/javascript/features/opensocial-templates/container.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/feature.xml b/features/src/main/javascript/features/opensocial-templates/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/feature.xml
rename to features/src/main/javascript/features/opensocial-templates/feature.xml
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js b/features/src/main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js
rename to features/src/main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js b/features/src/main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js
rename to features/src/main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js b/features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js
rename to features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/loader.js b/features/src/main/javascript/features/opensocial-templates/loader.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/loader.js
rename to features/src/main/javascript/features/opensocial-templates/loader.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/namespaces.js b/features/src/main/javascript/features/opensocial-templates/namespaces.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/namespaces.js
rename to features/src/main/javascript/features/opensocial-templates/namespaces.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/os.js b/features/src/main/javascript/features/opensocial-templates/os.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/os.js
rename to features/src/main/javascript/features/opensocial-templates/os.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/template.js b/features/src/main/javascript/features/opensocial-templates/template.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/template.js
rename to features/src/main/javascript/features/opensocial-templates/template.js
diff --git a/trunk/features/src/main/javascript/features/opensocial-templates/util.js b/features/src/main/javascript/features/opensocial-templates/util.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/opensocial-templates/util.js
rename to features/src/main/javascript/features/opensocial-templates/util.js
diff --git a/trunk/features/src/main/javascript/features/osapi.base/batch.js b/features/src/main/javascript/features/osapi.base/batch.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/osapi.base/batch.js
rename to features/src/main/javascript/features/osapi.base/batch.js
diff --git a/trunk/features/src/main/javascript/features/osapi.base/feature.xml b/features/src/main/javascript/features/osapi.base/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/osapi.base/feature.xml
rename to features/src/main/javascript/features/osapi.base/feature.xml
diff --git a/trunk/features/src/main/javascript/features/osapi.base/osapi.js b/features/src/main/javascript/features/osapi.base/osapi.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/osapi.base/osapi.js
rename to features/src/main/javascript/features/osapi.base/osapi.js
diff --git a/trunk/features/src/main/javascript/features/osapi.base/taming.js b/features/src/main/javascript/features/osapi.base/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/osapi.base/taming.js
rename to features/src/main/javascript/features/osapi.base/taming.js
diff --git a/trunk/features/src/main/javascript/features/osapi/feature.xml b/features/src/main/javascript/features/osapi/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/osapi/feature.xml
rename to features/src/main/javascript/features/osapi/feature.xml
diff --git a/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js b/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
rename to features/src/main/javascript/features/osapi/gadgetsrpctransport.js
diff --git a/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js b/features/src/main/javascript/features/osapi/jsonrpctransport.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js
rename to features/src/main/javascript/features/osapi/jsonrpctransport.js
diff --git a/trunk/features/src/main/javascript/features/osapi/peoplehelpers.js b/features/src/main/javascript/features/osapi/peoplehelpers.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/osapi/peoplehelpers.js
rename to features/src/main/javascript/features/osapi/peoplehelpers.js
diff --git a/trunk/features/src/main/javascript/features/osapi/taming.js b/features/src/main/javascript/features/osapi/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/osapi/taming.js
rename to features/src/main/javascript/features/osapi/taming.js
diff --git a/trunk/features/src/main/javascript/features/osml/feature.xml b/features/src/main/javascript/features/osml/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/osml/feature.xml
rename to features/src/main/javascript/features/osml/feature.xml
diff --git a/trunk/features/src/main/javascript/features/proxied-form-post/feature.xml b/features/src/main/javascript/features/proxied-form-post/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/proxied-form-post/feature.xml
rename to features/src/main/javascript/features/proxied-form-post/feature.xml
diff --git a/trunk/features/src/main/javascript/features/proxied-form-post/post.js b/features/src/main/javascript/features/proxied-form-post/post.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/proxied-form-post/post.js
rename to features/src/main/javascript/features/proxied-form-post/post.js
diff --git a/trunk/features/src/main/javascript/features/proxied-form-post/taming.js b/features/src/main/javascript/features/proxied-form-post/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/proxied-form-post/taming.js
rename to features/src/main/javascript/features/proxied-form-post/taming.js
diff --git a/trunk/features/src/main/javascript/features/pubsub/feature.xml b/features/src/main/javascript/features/pubsub/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/pubsub/feature.xml
rename to features/src/main/javascript/features/pubsub/feature.xml
diff --git a/trunk/features/src/main/javascript/features/pubsub/pubsub-router.js b/features/src/main/javascript/features/pubsub/pubsub-router.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/pubsub/pubsub-router.js
rename to features/src/main/javascript/features/pubsub/pubsub-router.js
diff --git a/trunk/features/src/main/javascript/features/pubsub/pubsub.js b/features/src/main/javascript/features/pubsub/pubsub.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/pubsub/pubsub.js
rename to features/src/main/javascript/features/pubsub/pubsub.js
diff --git a/trunk/features/src/main/javascript/features/pubsub/taming.js b/features/src/main/javascript/features/pubsub/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/pubsub/taming.js
rename to features/src/main/javascript/features/pubsub/taming.js
diff --git a/trunk/features/src/main/javascript/features/rpc/fe.transport.js b/features/src/main/javascript/features/rpc/fe.transport.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/rpc/fe.transport.js
rename to features/src/main/javascript/features/rpc/fe.transport.js
diff --git a/trunk/features/src/main/javascript/features/rpc/feature.xml b/features/src/main/javascript/features/rpc/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/rpc/feature.xml
rename to features/src/main/javascript/features/rpc/feature.xml
diff --git a/trunk/features/src/main/javascript/features/rpc/flash.transport.js b/features/src/main/javascript/features/rpc/flash.transport.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/rpc/flash.transport.js
rename to features/src/main/javascript/features/rpc/flash.transport.js
diff --git a/trunk/features/src/main/javascript/features/rpc/ifpc.transport.js b/features/src/main/javascript/features/rpc/ifpc.transport.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/rpc/ifpc.transport.js
rename to features/src/main/javascript/features/rpc/ifpc.transport.js
diff --git a/trunk/features/src/main/javascript/features/rpc/nix.transport.js b/features/src/main/javascript/features/rpc/nix.transport.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/rpc/nix.transport.js
rename to features/src/main/javascript/features/rpc/nix.transport.js
diff --git a/trunk/features/src/main/javascript/features/rpc/noop.transport.js b/features/src/main/javascript/features/rpc/noop.transport.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/rpc/noop.transport.js
rename to features/src/main/javascript/features/rpc/noop.transport.js
diff --git a/trunk/features/src/main/javascript/features/rpc/rmr.transport.js b/features/src/main/javascript/features/rpc/rmr.transport.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/rpc/rmr.transport.js
rename to features/src/main/javascript/features/rpc/rmr.transport.js
diff --git a/trunk/features/src/main/javascript/features/rpc/rpc.js b/features/src/main/javascript/features/rpc/rpc.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/rpc/rpc.js
rename to features/src/main/javascript/features/rpc/rpc.js
diff --git a/trunk/features/src/main/javascript/features/rpc/wpm.transport.js b/features/src/main/javascript/features/rpc/wpm.transport.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/rpc/wpm.transport.js
rename to features/src/main/javascript/features/rpc/wpm.transport.js
diff --git a/trunk/features/src/main/javascript/features/security-token/feature.xml b/features/src/main/javascript/features/security-token/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/security-token/feature.xml
rename to features/src/main/javascript/features/security-token/feature.xml
diff --git a/trunk/features/src/main/javascript/features/selection/feature.xml b/features/src/main/javascript/features/selection/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/selection/feature.xml
rename to features/src/main/javascript/features/selection/feature.xml
diff --git a/trunk/features/src/main/javascript/features/selection/selection.js b/features/src/main/javascript/features/selection/selection.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/selection/selection.js
rename to features/src/main/javascript/features/selection/selection.js
diff --git a/trunk/features/src/main/javascript/features/selection/selection_container.js b/features/src/main/javascript/features/selection/selection_container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/selection/selection_container.js
rename to features/src/main/javascript/features/selection/selection_container.js
diff --git a/trunk/features/src/main/javascript/features/selection/taming.js b/features/src/main/javascript/features/selection/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/selection/taming.js
rename to features/src/main/javascript/features/selection/taming.js
diff --git a/trunk/features/src/main/javascript/features/setprefs/feature.xml b/features/src/main/javascript/features/setprefs/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/setprefs/feature.xml
rename to features/src/main/javascript/features/setprefs/feature.xml
diff --git a/trunk/features/src/main/javascript/features/setprefs/setprefs.js b/features/src/main/javascript/features/setprefs/setprefs.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/setprefs/setprefs.js
rename to features/src/main/javascript/features/setprefs/setprefs.js
diff --git a/trunk/features/src/main/javascript/features/settitle/feature.xml b/features/src/main/javascript/features/settitle/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/settitle/feature.xml
rename to features/src/main/javascript/features/settitle/feature.xml
diff --git a/trunk/features/src/main/javascript/features/settitle/settitle.js b/features/src/main/javascript/features/settitle/settitle.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/settitle/settitle.js
rename to features/src/main/javascript/features/settitle/settitle.js
diff --git a/trunk/features/src/main/javascript/features/settitle/taming.js b/features/src/main/javascript/features/settitle/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/settitle/taming.js
rename to features/src/main/javascript/features/settitle/taming.js
diff --git a/trunk/features/src/main/javascript/features/shared-script-frame/feature.xml b/features/src/main/javascript/features/shared-script-frame/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/shared-script-frame/feature.xml
rename to features/src/main/javascript/features/shared-script-frame/feature.xml
diff --git a/trunk/features/src/main/javascript/features/shared-script-frame/shared-script-frame-container.js b/features/src/main/javascript/features/shared-script-frame/shared-script-frame-container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shared-script-frame/shared-script-frame-container.js
rename to features/src/main/javascript/features/shared-script-frame/shared-script-frame-container.js
diff --git a/trunk/features/src/main/javascript/features/shared-script-frame/shared-script-frame.js b/features/src/main/javascript/features/shared-script-frame/shared-script-frame.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shared-script-frame/shared-script-frame.js
rename to features/src/main/javascript/features/shared-script-frame/shared-script-frame.js
diff --git a/trunk/features/src/main/javascript/features/shared-script-frame/taming.js b/features/src/main/javascript/features/shared-script-frame/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shared-script-frame/taming.js
rename to features/src/main/javascript/features/shared-script-frame/taming.js
diff --git a/trunk/features/src/main/javascript/features/shindig.auth/auth-init.js b/features/src/main/javascript/features/shindig.auth/auth-init.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.auth/auth-init.js
rename to features/src/main/javascript/features/shindig.auth/auth-init.js
diff --git a/trunk/features/src/main/javascript/features/shindig.auth/auth.js b/features/src/main/javascript/features/shindig.auth/auth.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.auth/auth.js
rename to features/src/main/javascript/features/shindig.auth/auth.js
diff --git a/trunk/features/src/main/javascript/features/shindig.auth/feature.xml b/features/src/main/javascript/features/shindig.auth/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.auth/feature.xml
rename to features/src/main/javascript/features/shindig.auth/feature.xml
diff --git a/trunk/features/src/main/javascript/features/shindig.container-1.0/feature.xml b/features/src/main/javascript/features/shindig.container-1.0/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.container-1.0/feature.xml
rename to features/src/main/javascript/features/shindig.container-1.0/feature.xml
diff --git a/trunk/features/src/main/javascript/features/shindig.container/cookiebaseduserprefstore.js b/features/src/main/javascript/features/shindig.container/cookiebaseduserprefstore.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.container/cookiebaseduserprefstore.js
rename to features/src/main/javascript/features/shindig.container/cookiebaseduserprefstore.js
diff --git a/trunk/features/src/main/javascript/features/shindig.container/cookies.js b/features/src/main/javascript/features/shindig.container/cookies.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.container/cookies.js
rename to features/src/main/javascript/features/shindig.container/cookies.js
diff --git a/trunk/features/src/main/javascript/features/shindig.container/feature.xml b/features/src/main/javascript/features/shindig.container/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.container/feature.xml
rename to features/src/main/javascript/features/shindig.container/feature.xml
diff --git a/trunk/features/src/main/javascript/features/shindig.container/osapi.js b/features/src/main/javascript/features/shindig.container/osapi.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.container/osapi.js
rename to features/src/main/javascript/features/shindig.container/osapi.js
diff --git a/trunk/features/src/main/javascript/features/shindig.container/shindig-container.js b/features/src/main/javascript/features/shindig.container/shindig-container.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.container/shindig-container.js
rename to features/src/main/javascript/features/shindig.container/shindig-container.js
diff --git a/trunk/features/src/main/javascript/features/shindig.container/util.js b/features/src/main/javascript/features/shindig.container/util.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.container/util.js
rename to features/src/main/javascript/features/shindig.container/util.js
diff --git a/trunk/features/src/main/javascript/features/shindig.random/feature.xml b/features/src/main/javascript/features/shindig.random/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.random/feature.xml
rename to features/src/main/javascript/features/shindig.random/feature.xml
diff --git a/trunk/features/src/main/javascript/features/shindig.random/random.js b/features/src/main/javascript/features/shindig.random/random.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.random/random.js
rename to features/src/main/javascript/features/shindig.random/random.js
diff --git a/trunk/features/src/main/javascript/features/shindig.sha1/feature.xml b/features/src/main/javascript/features/shindig.sha1/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.sha1/feature.xml
rename to features/src/main/javascript/features/shindig.sha1/feature.xml
diff --git a/trunk/features/src/main/javascript/features/shindig.sha1/sha1.js b/features/src/main/javascript/features/shindig.sha1/sha1.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.sha1/sha1.js
rename to features/src/main/javascript/features/shindig.sha1/sha1.js
diff --git a/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml b/features/src/main/javascript/features/shindig.uri.ext/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml
rename to features/src/main/javascript/features/shindig.uri.ext/feature.xml
diff --git a/trunk/features/src/main/javascript/features/shindig.uri.ext/util.js b/features/src/main/javascript/features/shindig.uri.ext/util.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.uri.ext/util.js
rename to features/src/main/javascript/features/shindig.uri.ext/util.js
diff --git a/trunk/features/src/main/javascript/features/shindig.uri/feature.xml b/features/src/main/javascript/features/shindig.uri/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.uri/feature.xml
rename to features/src/main/javascript/features/shindig.uri/feature.xml
diff --git a/trunk/features/src/main/javascript/features/shindig.uri/uri.js b/features/src/main/javascript/features/shindig.uri/uri.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.uri/uri.js
rename to features/src/main/javascript/features/shindig.uri/uri.js
diff --git a/trunk/features/src/main/javascript/features/shindig.xhrwrapper/feature.xml b/features/src/main/javascript/features/shindig.xhrwrapper/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.xhrwrapper/feature.xml
rename to features/src/main/javascript/features/shindig.xhrwrapper/feature.xml
diff --git a/trunk/features/src/main/javascript/features/shindig.xhrwrapper/xhrwrapper.js b/features/src/main/javascript/features/shindig.xhrwrapper/xhrwrapper.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/shindig.xhrwrapper/xhrwrapper.js
rename to features/src/main/javascript/features/shindig.xhrwrapper/xhrwrapper.js
diff --git a/trunk/features/src/main/javascript/features/skins/feature.xml b/features/src/main/javascript/features/skins/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/skins/feature.xml
rename to features/src/main/javascript/features/skins/feature.xml
diff --git a/trunk/features/src/main/javascript/features/skins/skins.js b/features/src/main/javascript/features/skins/skins.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/skins/skins.js
rename to features/src/main/javascript/features/skins/skins.js
diff --git a/trunk/features/src/main/javascript/features/skins/taming.js b/features/src/main/javascript/features/skins/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/skins/taming.js
rename to features/src/main/javascript/features/skins/taming.js
diff --git a/trunk/features/src/main/javascript/features/tabs/feature.xml b/features/src/main/javascript/features/tabs/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/tabs/feature.xml
rename to features/src/main/javascript/features/tabs/feature.xml
diff --git a/trunk/features/src/main/javascript/features/tabs/tabs.js b/features/src/main/javascript/features/tabs/tabs.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/tabs/tabs.js
rename to features/src/main/javascript/features/tabs/tabs.js
diff --git a/trunk/features/src/main/javascript/features/tabs/taming.js b/features/src/main/javascript/features/tabs/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/tabs/taming.js
rename to features/src/main/javascript/features/tabs/taming.js
diff --git a/trunk/features/src/main/javascript/features/taming/feature.xml b/features/src/main/javascript/features/taming/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/taming/feature.xml
rename to features/src/main/javascript/features/taming/feature.xml
diff --git a/trunk/features/src/main/javascript/features/taming/taming.js b/features/src/main/javascript/features/taming/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/taming/taming.js
rename to features/src/main/javascript/features/taming/taming.js
diff --git a/trunk/features/src/main/javascript/features/views/feature.xml b/features/src/main/javascript/features/views/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/views/feature.xml
rename to features/src/main/javascript/features/views/feature.xml
diff --git a/trunk/features/src/main/javascript/features/views/taming.js b/features/src/main/javascript/features/views/taming.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/views/taming.js
rename to features/src/main/javascript/features/views/taming.js
diff --git a/trunk/features/src/main/javascript/features/views/views.js b/features/src/main/javascript/features/views/views.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/views/views.js
rename to features/src/main/javascript/features/views/views.js
diff --git a/trunk/features/src/main/javascript/features/xhrwrapper/feature.xml b/features/src/main/javascript/features/xhrwrapper/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/xhrwrapper/feature.xml
rename to features/src/main/javascript/features/xhrwrapper/feature.xml
diff --git a/trunk/features/src/main/javascript/features/xmlutil/feature.xml b/features/src/main/javascript/features/xmlutil/feature.xml
similarity index 100%
rename from trunk/features/src/main/javascript/features/xmlutil/feature.xml
rename to features/src/main/javascript/features/xmlutil/feature.xml
diff --git a/trunk/features/src/main/javascript/features/xmlutil/xmlutil.js b/features/src/main/javascript/features/xmlutil/xmlutil.js
similarity index 100%
rename from trunk/features/src/main/javascript/features/xmlutil/xmlutil.js
rename to features/src/main/javascript/features/xmlutil/xmlutil.js
diff --git a/trunk/features/src/site/site.xml b/features/src/site/site.xml
similarity index 100%
rename from trunk/features/src/site/site.xml
rename to features/src/site/site.xml
diff --git a/trunk/features/src/test/javascript/features/actions/actions_test.js b/features/src/test/javascript/features/actions/actions_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/actions/actions_test.js
rename to features/src/test/javascript/features/actions/actions_test.js
diff --git a/trunk/features/src/test/javascript/features/alltests.js b/features/src/test/javascript/features/alltests.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/alltests.js
rename to features/src/test/javascript/features/alltests.js
diff --git a/trunk/features/src/test/javascript/features/container.url/container_url_test.js b/features/src/test/javascript/features/container.url/container_url_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/container.url/container_url_test.js
rename to features/src/test/javascript/features/container.url/container_url_test.js
diff --git a/trunk/features/src/test/javascript/features/container.url/url_holder_test.js b/features/src/test/javascript/features/container.url/url_holder_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/container.url/url_holder_test.js
rename to features/src/test/javascript/features/container.url/url_holder_test.js
diff --git a/trunk/features/src/test/javascript/features/container.url/url_site_test.js b/features/src/test/javascript/features/container.url/url_site_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/container.url/url_site_test.js
rename to features/src/test/javascript/features/container.url/url_site_test.js
diff --git a/trunk/features/src/test/javascript/features/container/container_test.js b/features/src/test/javascript/features/container/container_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/container/container_test.js
rename to features/src/test/javascript/features/container/container_test.js
diff --git a/trunk/features/src/test/javascript/features/container/gadget_holder_test.js b/features/src/test/javascript/features/container/gadget_holder_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/container/gadget_holder_test.js
rename to features/src/test/javascript/features/container/gadget_holder_test.js
diff --git a/trunk/features/src/test/javascript/features/container/gadget_site_test.js b/features/src/test/javascript/features/container/gadget_site_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/container/gadget_site_test.js
rename to features/src/test/javascript/features/container/gadget_site_test.js
diff --git a/trunk/features/src/test/javascript/features/container/service_test.js b/features/src/test/javascript/features/container/service_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/container/service_test.js
rename to features/src/test/javascript/features/container/service_test.js
diff --git a/trunk/features/src/test/javascript/features/container/util_test.js b/features/src/test/javascript/features/container/util_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/container/util_test.js
rename to features/src/test/javascript/features/container/util_test.js
diff --git a/trunk/features/src/test/javascript/features/core.io/iotest.js b/features/src/test/javascript/features/core.io/iotest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/core.io/iotest.js
rename to features/src/test/javascript/features/core.io/iotest.js
diff --git a/trunk/features/src/test/javascript/features/core/authtest.js b/features/src/test/javascript/features/core/authtest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/core/authtest.js
rename to features/src/test/javascript/features/core/authtest.js
diff --git a/trunk/features/src/test/javascript/features/core/config-test.js b/features/src/test/javascript/features/core/config-test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/core/config-test.js
rename to features/src/test/javascript/features/core/config-test.js
diff --git a/trunk/features/src/test/javascript/features/core/prefstest.js b/features/src/test/javascript/features/core/prefstest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/core/prefstest.js
rename to features/src/test/javascript/features/core/prefstest.js
diff --git a/trunk/features/src/test/javascript/features/core/utiltest.js b/features/src/test/javascript/features/core/utiltest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/core/utiltest.js
rename to features/src/test/javascript/features/core/utiltest.js
diff --git a/trunk/features/src/test/javascript/features/embeddedexperiences/embedded_experiences_container_test.js b/features/src/test/javascript/features/embeddedexperiences/embedded_experiences_container_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/embeddedexperiences/embedded_experiences_container_test.js
rename to features/src/test/javascript/features/embeddedexperiences/embedded_experiences_container_test.js
diff --git a/trunk/features/src/test/javascript/features/json-xmltojson/jsonxmltojson-test.js b/features/src/test/javascript/features/json-xmltojson/jsonxmltojson-test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/json-xmltojson/jsonxmltojson-test.js
rename to features/src/test/javascript/features/json-xmltojson/jsonxmltojson-test.js
diff --git a/trunk/features/src/test/javascript/features/jsondom/jsondom-test.js b/features/src/test/javascript/features/jsondom/jsondom-test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/jsondom/jsondom-test.js
rename to features/src/test/javascript/features/jsondom/jsondom-test.js
diff --git a/trunk/features/src/test/javascript/features/mocks/env.js b/features/src/test/javascript/features/mocks/env.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/mocks/env.js
rename to features/src/test/javascript/features/mocks/env.js
diff --git a/trunk/features/src/test/javascript/features/mocks/window.js b/features/src/test/javascript/features/mocks/window.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/mocks/window.js
rename to features/src/test/javascript/features/mocks/window.js
diff --git a/trunk/features/src/test/javascript/features/mocks/xhr.js b/features/src/test/javascript/features/mocks/xhr.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/mocks/xhr.js
rename to features/src/test/javascript/features/mocks/xhr.js
diff --git a/trunk/features/src/test/javascript/features/oauthpopup/oauthpopup-test.js b/features/src/test/javascript/features/oauthpopup/oauthpopup-test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/oauthpopup/oauthpopup-test.js
rename to features/src/test/javascript/features/oauthpopup/oauthpopup-test.js
diff --git a/trunk/features/src/test/javascript/features/open-views/viewEnhancements-test.js b/features/src/test/javascript/features/open-views/viewEnhancements-test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/open-views/viewEnhancements-test.js
rename to features/src/test/javascript/features/open-views/viewEnhancements-test.js
diff --git a/trunk/features/src/test/javascript/features/opensearch/opensearch_test.js b/features/src/test/javascript/features/opensearch/opensearch_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensearch/opensearch_test.js
rename to features/src/test/javascript/features/opensearch/opensearch_test.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-base/jsonactivitytest.js b/features/src/test/javascript/features/opensocial-base/jsonactivitytest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-base/jsonactivitytest.js
rename to features/src/test/javascript/features/opensocial-base/jsonactivitytest.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-base/jsonalbumtest.js b/features/src/test/javascript/features/opensocial-base/jsonalbumtest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-base/jsonalbumtest.js
rename to features/src/test/javascript/features/opensocial-base/jsonalbumtest.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-base/jsonmediaitemtest.js b/features/src/test/javascript/features/opensocial-base/jsonmediaitemtest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-base/jsonmediaitemtest.js
rename to features/src/test/javascript/features/opensocial-base/jsonmediaitemtest.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-data-context/datacontexttest.js b/features/src/test/javascript/features/opensocial-data-context/datacontexttest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-data-context/datacontexttest.js
rename to features/src/test/javascript/features/opensocial-data-context/datacontexttest.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-data-context/index.html b/features/src/test/javascript/features/opensocial-data-context/index.html
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-data-context/index.html
rename to features/src/test/javascript/features/opensocial-data-context/index.html
diff --git a/trunk/features/src/test/javascript/features/opensocial-data/datatest.js b/features/src/test/javascript/features/opensocial-data/datatest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-data/datatest.js
rename to features/src/test/javascript/features/opensocial-data/datatest.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-data/index.html b/features/src/test/javascript/features/opensocial-data/index.html
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-data/index.html
rename to features/src/test/javascript/features/opensocial-data/index.html
diff --git a/trunk/features/src/test/javascript/features/opensocial-reference/activitytest.js b/features/src/test/javascript/features/opensocial-reference/activitytest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-reference/activitytest.js
rename to features/src/test/javascript/features/opensocial-reference/activitytest.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-templates/compiler_test.js b/features/src/test/javascript/features/opensocial-templates/compiler_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-templates/compiler_test.js
rename to features/src/test/javascript/features/opensocial-templates/compiler_test.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-templates/container_test.js b/features/src/test/javascript/features/opensocial-templates/container_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-templates/container_test.js
rename to features/src/test/javascript/features/opensocial-templates/container_test.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-templates/domutil.js b/features/src/test/javascript/features/opensocial-templates/domutil.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-templates/domutil.js
rename to features/src/test/javascript/features/opensocial-templates/domutil.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-templates/index.html b/features/src/test/javascript/features/opensocial-templates/index.html
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-templates/index.html
rename to features/src/test/javascript/features/opensocial-templates/index.html
diff --git a/trunk/features/src/test/javascript/features/opensocial-templates/loader_test.js b/features/src/test/javascript/features/opensocial-templates/loader_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-templates/loader_test.js
rename to features/src/test/javascript/features/opensocial-templates/loader_test.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-templates/os_test.js b/features/src/test/javascript/features/opensocial-templates/os_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-templates/os_test.js
rename to features/src/test/javascript/features/opensocial-templates/os_test.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-templates/template_test.js b/features/src/test/javascript/features/opensocial-templates/template_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-templates/template_test.js
rename to features/src/test/javascript/features/opensocial-templates/template_test.js
diff --git a/trunk/features/src/test/javascript/features/opensocial-templates/util_test.js b/features/src/test/javascript/features/opensocial-templates/util_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/opensocial-templates/util_test.js
rename to features/src/test/javascript/features/opensocial-templates/util_test.js
diff --git a/trunk/features/src/test/javascript/features/osapi/batchtest.js b/features/src/test/javascript/features/osapi/batchtest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/osapi/batchtest.js
rename to features/src/test/javascript/features/osapi/batchtest.js
diff --git a/trunk/features/src/test/javascript/features/osapi/jsonrpctransporttest.js b/features/src/test/javascript/features/osapi/jsonrpctransporttest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/osapi/jsonrpctransporttest.js
rename to features/src/test/javascript/features/osapi/jsonrpctransporttest.js
diff --git a/trunk/features/src/test/javascript/features/osapi/osapitest.js b/features/src/test/javascript/features/osapi/osapitest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/osapi/osapitest.js
rename to features/src/test/javascript/features/osapi/osapitest.js
diff --git a/trunk/features/src/test/javascript/features/selection/selection_test.js b/features/src/test/javascript/features/selection/selection_test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/selection/selection_test.js
rename to features/src/test/javascript/features/selection/selection_test.js
diff --git a/trunk/features/src/test/javascript/features/setprefs/setprefstest.js b/features/src/test/javascript/features/setprefs/setprefstest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/setprefs/setprefstest.js
rename to features/src/test/javascript/features/setprefs/setprefstest.js
diff --git a/trunk/features/src/test/javascript/features/shindig.uri/uritest.js b/features/src/test/javascript/features/shindig.uri/uritest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/shindig.uri/uritest.js
rename to features/src/test/javascript/features/shindig.uri/uritest.js
diff --git a/trunk/features/src/test/javascript/features/views/requestnavigateto-test.js b/features/src/test/javascript/features/views/requestnavigateto-test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/views/requestnavigateto-test.js
rename to features/src/test/javascript/features/views/requestnavigateto-test.js
diff --git a/trunk/features/src/test/javascript/features/views/urltemplatetest.js b/features/src/test/javascript/features/views/urltemplatetest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/views/urltemplatetest.js
rename to features/src/test/javascript/features/views/urltemplatetest.js
diff --git a/trunk/features/src/test/javascript/features/views/views-init-test.js b/features/src/test/javascript/features/views/views-init-test.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/views/views-init-test.js
rename to features/src/test/javascript/features/views/views-init-test.js
diff --git a/trunk/features/src/test/javascript/features/xhrwrapper/xhrwrappertest.js b/features/src/test/javascript/features/xhrwrapper/xhrwrappertest.js
similarity index 100%
rename from trunk/features/src/test/javascript/features/xhrwrapper/xhrwrappertest.js
rename to features/src/test/javascript/features/xhrwrapper/xhrwrappertest.js
diff --git a/trunk/features/src/test/javascript/lib/JsUnit.js b/features/src/test/javascript/lib/JsUnit.js
similarity index 100%
rename from trunk/features/src/test/javascript/lib/JsUnit.js
rename to features/src/test/javascript/lib/JsUnit.js
diff --git a/trunk/features/src/test/javascript/lib/JsUnitBV.js b/features/src/test/javascript/lib/JsUnitBV.js
similarity index 100%
rename from trunk/features/src/test/javascript/lib/JsUnitBV.js
rename to features/src/test/javascript/lib/JsUnitBV.js
diff --git a/trunk/features/src/test/javascript/lib/JsUnitNSServer.js b/features/src/test/javascript/lib/JsUnitNSServer.js
similarity index 100%
rename from trunk/features/src/test/javascript/lib/JsUnitNSServer.js
rename to features/src/test/javascript/lib/JsUnitNSServer.js
diff --git a/trunk/features/src/test/javascript/lib/JsUtil.js b/features/src/test/javascript/lib/JsUtil.js
similarity index 100%
rename from trunk/features/src/test/javascript/lib/JsUtil.js
rename to features/src/test/javascript/lib/JsUtil.js
diff --git a/trunk/features/src/test/javascript/lib/testutils.js b/features/src/test/javascript/lib/testutils.js
similarity index 100%
rename from trunk/features/src/test/javascript/lib/testutils.js
rename to features/src/test/javascript/lib/testutils.js
diff --git a/trunk/java/LICENSE b/java/LICENSE
similarity index 100%
rename from trunk/java/LICENSE
rename to java/LICENSE
diff --git a/trunk/java/NOTICE b/java/NOTICE
similarity index 100%
rename from trunk/java/NOTICE
rename to java/NOTICE
diff --git a/trunk/java/README b/java/README
similarity index 100%
rename from trunk/java/README
rename to java/README
diff --git a/trunk/java/common/conf/shindig.properties b/java/common/conf/shindig.properties
similarity index 100%
rename from trunk/java/common/conf/shindig.properties
rename to java/common/conf/shindig.properties
diff --git a/trunk/java/common/pom.xml b/java/common/pom.xml
similarity index 100%
rename from trunk/java/common/pom.xml
rename to java/common/pom.xml
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/AbstractSecurityToken.java b/java/common/src/main/java/org/apache/shindig/auth/AbstractSecurityToken.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/AbstractSecurityToken.java
rename to java/common/src/main/java/org/apache/shindig/auth/AbstractSecurityToken.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java b/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java
rename to java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java b/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java
rename to java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java b/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java
rename to java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfoUtil.java b/java/common/src/main/java/org/apache/shindig/auth/AuthInfoUtil.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfoUtil.java
rename to java/common/src/main/java/org/apache/shindig/auth/AuthInfoUtil.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java b/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java
rename to java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationMode.java b/java/common/src/main/java/org/apache/shindig/auth/AuthenticationMode.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationMode.java
rename to java/common/src/main/java/org/apache/shindig/auth/AuthenticationMode.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java b/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
rename to java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java b/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
rename to java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenCodec.java b/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenCodec.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenCodec.java
rename to java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenCodec.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityToken.java b/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityToken.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityToken.java
rename to java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityToken.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenCodec.java b/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenCodec.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenCodec.java
rename to java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenCodec.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenCodec.java b/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenCodec.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenCodec.java
rename to java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenCodec.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/ForwardingSecurityToken.java b/java/common/src/main/java/org/apache/shindig/auth/ForwardingSecurityToken.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/ForwardingSecurityToken.java
rename to java/common/src/main/java/org/apache/shindig/auth/ForwardingSecurityToken.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthConstants.java b/java/common/src/main/java/org/apache/shindig/auth/OAuthConstants.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthConstants.java
rename to java/common/src/main/java/org/apache/shindig/auth/OAuthConstants.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthUtil.java b/java/common/src/main/java/org/apache/shindig/auth/OAuthUtil.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthUtil.java
rename to java/common/src/main/java/org/apache/shindig/auth/OAuthUtil.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java b/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java
rename to java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenCodec.java b/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenCodec.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenCodec.java
rename to java/common/src/main/java/org/apache/shindig/auth/SecurityTokenCodec.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenException.java b/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenException.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenException.java
rename to java/common/src/main/java/org/apache/shindig/auth/SecurityTokenException.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java b/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
rename to java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/JsonProperty.java b/java/common/src/main/java/org/apache/shindig/common/JsonProperty.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/JsonProperty.java
rename to java/common/src/main/java/org/apache/shindig/common/JsonProperty.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java b/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java
rename to java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java b/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java
rename to java/common/src/main/java/org/apache/shindig/common/JsonUtil.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/Nullable.java b/java/common/src/main/java/org/apache/shindig/common/Nullable.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/Nullable.java
rename to java/common/src/main/java/org/apache/shindig/common/Nullable.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/Pair.java b/java/common/src/main/java/org/apache/shindig/common/Pair.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/Pair.java
rename to java/common/src/main/java/org/apache/shindig/common/Pair.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java b/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
rename to java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/cache/Cache.java b/java/common/src/main/java/org/apache/shindig/common/cache/Cache.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/cache/Cache.java
rename to java/common/src/main/java/org/apache/shindig/common/cache/Cache.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java b/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java
rename to java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/cache/LruCache.java b/java/common/src/main/java/org/apache/shindig/common/cache/LruCache.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/cache/LruCache.java
rename to java/common/src/main/java/org/apache/shindig/common/cache/LruCache.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java b/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java
rename to java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/cache/NullCache.java b/java/common/src/main/java/org/apache/shindig/common/cache/NullCache.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/cache/NullCache.java
rename to java/common/src/main/java/org/apache/shindig/common/cache/NullCache.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/cache/SoftExpiringCache.java b/java/common/src/main/java/org/apache/shindig/common/cache/SoftExpiringCache.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/cache/SoftExpiringCache.java
rename to java/common/src/main/java/org/apache/shindig/common/cache/SoftExpiringCache.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java b/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
rename to java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheModule.java b/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheModule.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheModule.java
rename to java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheModule.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java b/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java
rename to java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java b/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
rename to java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BlobCrypter.java b/java/common/src/main/java/org/apache/shindig/common/crypto/BlobCrypter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BlobCrypter.java
rename to java/common/src/main/java/org/apache/shindig/common/crypto/BlobCrypter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BlobCrypterException.java b/java/common/src/main/java/org/apache/shindig/common/crypto/BlobCrypterException.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BlobCrypterException.java
rename to java/common/src/main/java/org/apache/shindig/common/crypto/BlobCrypterException.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BlobExpiredException.java b/java/common/src/main/java/org/apache/shindig/common/crypto/BlobExpiredException.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BlobExpiredException.java
rename to java/common/src/main/java/org/apache/shindig/common/crypto/BlobExpiredException.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java b/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
rename to java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/logging/i18n/MessageKeys.java b/java/common/src/main/java/org/apache/shindig/common/logging/i18n/MessageKeys.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/logging/i18n/MessageKeys.java
rename to java/common/src/main/java/org/apache/shindig/common/logging/i18n/MessageKeys.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/Authority.java b/java/common/src/main/java/org/apache/shindig/common/servlet/Authority.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/servlet/Authority.java
rename to java/common/src/main/java/org/apache/shindig/common/servlet/Authority.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/BasicAuthority.java b/java/common/src/main/java/org/apache/shindig/common/servlet/BasicAuthority.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/servlet/BasicAuthority.java
rename to java/common/src/main/java/org/apache/shindig/common/servlet/BasicAuthority.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java b/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
rename to java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HostFilter.java b/java/common/src/main/java/org/apache/shindig/common/servlet/HostFilter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HostFilter.java
rename to java/common/src/main/java/org/apache/shindig/common/servlet/HostFilter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpServletUserAgentProvider.java b/java/common/src/main/java/org/apache/shindig/common/servlet/HttpServletUserAgentProvider.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpServletUserAgentProvider.java
rename to java/common/src/main/java/org/apache/shindig/common/servlet/HttpServletUserAgentProvider.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java b/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java
rename to java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedFilter.java b/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedFilter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedFilter.java
rename to java/common/src/main/java/org/apache/shindig/common/servlet/InjectedFilter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java b/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java
rename to java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/ParameterFetcher.java b/java/common/src/main/java/org/apache/shindig/common/servlet/ParameterFetcher.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/servlet/ParameterFetcher.java
rename to java/common/src/main/java/org/apache/shindig/common/servlet/ParameterFetcher.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/ServletRequestContext.java b/java/common/src/main/java/org/apache/shindig/common/servlet/ServletRequestContext.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/servlet/ServletRequestContext.java
rename to java/common/src/main/java/org/apache/shindig/common/servlet/ServletRequestContext.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/UserAgent.java b/java/common/src/main/java/org/apache/shindig/common/servlet/UserAgent.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/servlet/UserAgent.java
rename to java/common/src/main/java/org/apache/shindig/common/servlet/UserAgent.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/uri/DefaultUriParser.java b/java/common/src/main/java/org/apache/shindig/common/uri/DefaultUriParser.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/uri/DefaultUriParser.java
rename to java/common/src/main/java/org/apache/shindig/common/uri/DefaultUriParser.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java b/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java
rename to java/common/src/main/java/org/apache/shindig/common/uri/Uri.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java b/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
rename to java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriParser.java b/java/common/src/main/java/org/apache/shindig/common/uri/UriParser.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriParser.java
rename to java/common/src/main/java/org/apache/shindig/common/uri/UriParser.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/util/Base32.java b/java/common/src/main/java/org/apache/shindig/common/util/Base32.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/util/Base32.java
rename to java/common/src/main/java/org/apache/shindig/common/util/Base32.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java b/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
rename to java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java b/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java
rename to java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java b/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java
rename to java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java b/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
rename to java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java b/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java
rename to java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java b/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java
rename to java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java b/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
rename to java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/util/TimeSource.java b/java/common/src/main/java/org/apache/shindig/common/util/TimeSource.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/util/TimeSource.java
rename to java/common/src/main/java/org/apache/shindig/common/util/TimeSource.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/util/Utf8UrlCoder.java b/java/common/src/main/java/org/apache/shindig/common/util/Utf8UrlCoder.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/util/Utf8UrlCoder.java
rename to java/common/src/main/java/org/apache/shindig/common/util/Utf8UrlCoder.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java b/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java
rename to java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlException.java b/java/common/src/main/java/org/apache/shindig/common/xml/XmlException.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlException.java
rename to java/common/src/main/java/org/apache/shindig/common/xml/XmlException.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java b/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
rename to java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java b/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java
rename to java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfig.java b/java/common/src/main/java/org/apache/shindig/config/ContainerConfig.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfig.java
rename to java/common/src/main/java/org/apache/shindig/config/ContainerConfig.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java b/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java
rename to java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigException.java b/java/common/src/main/java/org/apache/shindig/config/ContainerConfigException.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigException.java
rename to java/common/src/main/java/org/apache/shindig/config/ContainerConfigException.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java b/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java
rename to java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/config/ExpressionContainerConfig.java b/java/common/src/main/java/org/apache/shindig/config/ExpressionContainerConfig.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/config/ExpressionContainerConfig.java
rename to java/common/src/main/java/org/apache/shindig/config/ExpressionContainerConfig.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java b/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
rename to java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java b/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java
rename to java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/ELTypeConverter.java b/java/common/src/main/java/org/apache/shindig/expressions/ELTypeConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/ELTypeConverter.java
rename to java/common/src/main/java/org/apache/shindig/expressions/ELTypeConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/ExpressionProvider.java b/java/common/src/main/java/org/apache/shindig/expressions/ExpressionProvider.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/ExpressionProvider.java
rename to java/common/src/main/java/org/apache/shindig/expressions/ExpressionProvider.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java b/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
rename to java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/Functions.java b/java/common/src/main/java/org/apache/shindig/expressions/Functions.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/Functions.java
rename to java/common/src/main/java/org/apache/shindig/expressions/Functions.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/JsonELResolver.java b/java/common/src/main/java/org/apache/shindig/expressions/JsonELResolver.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/JsonELResolver.java
rename to java/common/src/main/java/org/apache/shindig/expressions/JsonELResolver.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java b/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java
rename to java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/RootELResolver.java b/java/common/src/main/java/org/apache/shindig/expressions/RootELResolver.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/RootELResolver.java
rename to java/common/src/main/java/org/apache/shindig/expressions/RootELResolver.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java b/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java
rename to java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java b/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java
rename to java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperModule.java b/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperModule.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperModule.java
rename to java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperModule.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperProvider.java b/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperProvider.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperProvider.java
rename to java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperProvider.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperTypeConverter.java b/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperTypeConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperTypeConverter.java
rename to java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperTypeConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java b/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java
rename to java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelProvider.java b/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelProvider.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelProvider.java
rename to java/common/src/main/java/org/apache/shindig/expressions/juel/JuelProvider.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelTypeConverter.java b/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelTypeConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelTypeConverter.java
rename to java/common/src/main/java/org/apache/shindig/expressions/juel/JuelTypeConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java b/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java
rename to java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java b/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
rename to java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java b/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
rename to java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java b/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java
rename to java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java b/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
rename to java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServletFetcher.java b/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServletFetcher.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServletFetcher.java
rename to java/common/src/main/java/org/apache/shindig/protocol/DataServiceServletFetcher.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java b/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
rename to java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java b/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java
rename to java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerPreconditions.java b/java/common/src/main/java/org/apache/shindig/protocol/HandlerPreconditions.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerPreconditions.java
rename to java/common/src/main/java/org/apache/shindig/protocol/HandlerPreconditions.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerRegistry.java b/java/common/src/main/java/org/apache/shindig/protocol/HandlerRegistry.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerRegistry.java
rename to java/common/src/main/java/org/apache/shindig/protocol/HandlerRegistry.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java b/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
rename to java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/Operation.java b/java/common/src/main/java/org/apache/shindig/protocol/Operation.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/Operation.java
rename to java/common/src/main/java/org/apache/shindig/protocol/Operation.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/ProtocolException.java b/java/common/src/main/java/org/apache/shindig/protocol/ProtocolException.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/ProtocolException.java
rename to java/common/src/main/java/org/apache/shindig/protocol/ProtocolException.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/RequestItem.java b/java/common/src/main/java/org/apache/shindig/protocol/RequestItem.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/RequestItem.java
rename to java/common/src/main/java/org/apache/shindig/protocol/RequestItem.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/ResponseItem.java b/java/common/src/main/java/org/apache/shindig/protocol/ResponseItem.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/ResponseItem.java
rename to java/common/src/main/java/org/apache/shindig/protocol/ResponseItem.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/RestHandler.java b/java/common/src/main/java/org/apache/shindig/protocol/RestHandler.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/RestHandler.java
rename to java/common/src/main/java/org/apache/shindig/protocol/RestHandler.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/RestfulCollection.java b/java/common/src/main/java/org/apache/shindig/protocol/RestfulCollection.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/RestfulCollection.java
rename to java/common/src/main/java/org/apache/shindig/protocol/RestfulCollection.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/RpcHandler.java b/java/common/src/main/java/org/apache/shindig/protocol/RpcHandler.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/RpcHandler.java
rename to java/common/src/main/java/org/apache/shindig/protocol/RpcHandler.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/Service.java b/java/common/src/main/java/org/apache/shindig/protocol/Service.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/Service.java
rename to java/common/src/main/java/org/apache/shindig/protocol/Service.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/SystemHandler.java b/java/common/src/main/java/org/apache/shindig/protocol/SystemHandler.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/SystemHandler.java
rename to java/common/src/main/java/org/apache/shindig/protocol/SystemHandler.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanConverter.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanConverter.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ClassFieldMapping.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ClassFieldMapping.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ClassFieldMapping.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ClassFieldMapping.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ExtendableBeanConverter.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ExtendableBeanConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ExtendableBeanConverter.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ExtendableBeanConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanConverter.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanConverter.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceFieldAliasMapping.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceFieldAliasMapping.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceFieldAliasMapping.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceFieldAliasMapping.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceFieldAliasingMapper.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceFieldAliasingMapper.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceFieldAliasingMapper.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceFieldAliasingMapper.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/NamespaceSet.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/NamespaceSet.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/NamespaceSet.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/NamespaceSet.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/RestfullCollectionConverter.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/RestfullCollectionConverter.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/RestfullCollectionConverter.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/RestfullCollectionConverter.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackWriterWrapper.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackWriterWrapper.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackWriterWrapper.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackWriterWrapper.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ThreadSafeWriterStack.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ThreadSafeWriterStack.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ThreadSafeWriterStack.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ThreadSafeWriterStack.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/WriterStack.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/WriterStack.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/WriterStack.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/WriterStack.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/XStreamConfiguration.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/XStreamConfiguration.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/XStreamConfiguration.java
rename to java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/XStreamConfiguration.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/Enum.java b/java/common/src/main/java/org/apache/shindig/protocol/model/Enum.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/model/Enum.java
rename to java/common/src/main/java/org/apache/shindig/protocol/model/Enum.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/EnumImpl.java b/java/common/src/main/java/org/apache/shindig/protocol/model/EnumImpl.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/model/EnumImpl.java
rename to java/common/src/main/java/org/apache/shindig/protocol/model/EnumImpl.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/Exportablebean.java b/java/common/src/main/java/org/apache/shindig/protocol/model/Exportablebean.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/model/Exportablebean.java
rename to java/common/src/main/java/org/apache/shindig/protocol/model/Exportablebean.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/ExtendableBean.java b/java/common/src/main/java/org/apache/shindig/protocol/model/ExtendableBean.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/model/ExtendableBean.java
rename to java/common/src/main/java/org/apache/shindig/protocol/model/ExtendableBean.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/ExtendableBeanImpl.java b/java/common/src/main/java/org/apache/shindig/protocol/model/ExtendableBeanImpl.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/model/ExtendableBeanImpl.java
rename to java/common/src/main/java/org/apache/shindig/protocol/model/ExtendableBeanImpl.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/FilterOperation.java b/java/common/src/main/java/org/apache/shindig/protocol/model/FilterOperation.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/model/FilterOperation.java
rename to java/common/src/main/java/org/apache/shindig/protocol/model/FilterOperation.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/SortOrder.java b/java/common/src/main/java/org/apache/shindig/protocol/model/SortOrder.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/model/SortOrder.java
rename to java/common/src/main/java/org/apache/shindig/protocol/model/SortOrder.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java b/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java
rename to java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParser.java b/java/common/src/main/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParser.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParser.java
rename to java/common/src/main/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParser.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java b/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java
rename to java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java
diff --git a/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/MultipartFormParser.java b/java/common/src/main/java/org/apache/shindig/protocol/multipart/MultipartFormParser.java
similarity index 100%
rename from trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/MultipartFormParser.java
rename to java/common/src/main/java/org/apache/shindig/protocol/multipart/MultipartFormParser.java
diff --git a/trunk/java/common/src/main/resources/cache.ccf b/java/common/src/main/resources/cache.ccf
similarity index 100%
rename from trunk/java/common/src/main/resources/cache.ccf
rename to java/common/src/main/resources/cache.ccf
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/cache/ehcache/SizeOfFilter.txt b/java/common/src/main/resources/org/apache/shindig/common/cache/ehcache/SizeOfFilter.txt
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/cache/ehcache/SizeOfFilter.txt
rename to java/common/src/main/resources/org/apache/shindig/common/cache/ehcache/SizeOfFilter.txt
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml b/java/common/src/main/resources/org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml
rename to java/common/src/main/resources/org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ar.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ar.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ar.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ar.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ca.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ca.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ca.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ca.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_cs.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_cs.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_cs.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_cs.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_da.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_da.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_da.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_da.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_de.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_de.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_de.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_de.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_el.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_el.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_el.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_el.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_en_US.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_en_US.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_en_US.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_en_US.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_es.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_es.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_es.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_es.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_fi.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_fi.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_fi.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_fi.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_fr.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_fr.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_fr.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_fr.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_hu.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_hu.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_hu.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_hu.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_it.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_it.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_it.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_it.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_iw.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_iw.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_iw.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_iw.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ja.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ja.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ja.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ja.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_kk.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_kk.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_kk.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_kk.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ko.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ko.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ko.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ko.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_nl.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_nl.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_nl.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_nl.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_no.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_no.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_no.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_no.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pl.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pl.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pl.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pl.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pt.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pt.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pt.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pt.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pt_BR.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pt_BR.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pt_BR.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_pt_BR.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ru.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ru.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ru.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_ru.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_sl.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_sl.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_sl.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_sl.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_sv.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_sv.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_sv.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_sv.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_th.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_th.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_th.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_th.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_tr.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_tr.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_tr.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_tr.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_zh.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_zh.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_zh.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_zh.properties
diff --git a/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_zh_TW.properties b/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_zh_TW.properties
similarity index 100%
rename from trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_zh_TW.properties
rename to java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_zh_TW.properties
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoUtilTest.java b/java/common/src/test/java/org/apache/shindig/auth/AuthInfoUtilTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoUtilTest.java
rename to java/common/src/test/java/org/apache/shindig/auth/AuthInfoUtilTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthenticationServletFilterTest.java b/java/common/src/test/java/org/apache/shindig/auth/AuthenticationServletFilterTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/auth/AuthenticationServletFilterTest.java
rename to java/common/src/test/java/org/apache/shindig/auth/AuthenticationServletFilterTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/auth/BasicSecurityTokenCodecTest.java b/java/common/src/test/java/org/apache/shindig/auth/BasicSecurityTokenCodecTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/auth/BasicSecurityTokenCodecTest.java
rename to java/common/src/test/java/org/apache/shindig/auth/BasicSecurityTokenCodecTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenCodecTest.java b/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenCodecTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenCodecTest.java
rename to java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenCodecTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java b/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java
rename to java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/auth/DefaultSecurityTokenCodecTest.java b/java/common/src/test/java/org/apache/shindig/auth/DefaultSecurityTokenCodecTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/auth/DefaultSecurityTokenCodecTest.java
rename to java/common/src/test/java/org/apache/shindig/auth/DefaultSecurityTokenCodecTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/auth/UrlParameterAuthenticationHandlerTest.java b/java/common/src/test/java/org/apache/shindig/auth/UrlParameterAuthenticationHandlerTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/auth/UrlParameterAuthenticationHandlerTest.java
rename to java/common/src/test/java/org/apache/shindig/auth/UrlParameterAuthenticationHandlerTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java b/java/common/src/test/java/org/apache/shindig/common/AllTests.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java
rename to java/common/src/test/java/org/apache/shindig/common/AllTests.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java b/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java
rename to java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/JsonAssert.java b/java/common/src/test/java/org/apache/shindig/common/JsonAssert.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/JsonAssert.java
rename to java/common/src/test/java/org/apache/shindig/common/JsonAssert.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java b/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
rename to java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/JsonUtilTest.java b/java/common/src/test/java/org/apache/shindig/common/JsonUtilTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/JsonUtilTest.java
rename to java/common/src/test/java/org/apache/shindig/common/JsonUtilTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java b/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java
rename to java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/PairTest.java b/java/common/src/test/java/org/apache/shindig/common/PairTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/PairTest.java
rename to java/common/src/test/java/org/apache/shindig/common/PairTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/cache/LruCacheProviderTest.java b/java/common/src/test/java/org/apache/shindig/common/cache/LruCacheProviderTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/cache/LruCacheProviderTest.java
rename to java/common/src/test/java/org/apache/shindig/common/cache/LruCacheProviderTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/cache/LruCacheTest.java b/java/common/src/test/java/org/apache/shindig/common/cache/LruCacheTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/cache/LruCacheTest.java
rename to java/common/src/test/java/org/apache/shindig/common/cache/LruCacheTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/cache/SoftExpiringCacheTest.java b/java/common/src/test/java/org/apache/shindig/common/cache/SoftExpiringCacheTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/cache/SoftExpiringCacheTest.java
rename to java/common/src/test/java/org/apache/shindig/common/cache/SoftExpiringCacheTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java b/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java
rename to java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java b/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java
rename to java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java b/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java
rename to java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/BasicAuthorityTest.java b/java/common/src/test/java/org/apache/shindig/common/servlet/BasicAuthorityTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/servlet/BasicAuthorityTest.java
rename to java/common/src/test/java/org/apache/shindig/common/servlet/BasicAuthorityTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletResponseRecorder.java b/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletResponseRecorder.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletResponseRecorder.java
rename to java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletResponseRecorder.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletUserAgentProviderTest.java b/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletUserAgentProviderTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletUserAgentProviderTest.java
rename to java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletUserAgentProviderTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpUtilTest.java b/java/common/src/test/java/org/apache/shindig/common/servlet/HttpUtilTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpUtilTest.java
rename to java/common/src/test/java/org/apache/shindig/common/servlet/HttpUtilTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java b/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java
rename to java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java b/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java
rename to java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java b/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
rename to java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/testing/ImmediateExecutorService.java b/java/common/src/test/java/org/apache/shindig/common/testing/ImmediateExecutorService.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/testing/ImmediateExecutorService.java
rename to java/common/src/test/java/org/apache/shindig/common/testing/ImmediateExecutorService.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java b/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java
rename to java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java b/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java
rename to java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java b/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java
rename to java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java b/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java
rename to java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java b/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java
rename to java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/util/HashUtilTest.java b/java/common/src/test/java/org/apache/shindig/common/util/HashUtilTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/util/HashUtilTest.java
rename to java/common/src/test/java/org/apache/shindig/common/util/HashUtilTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java b/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
rename to java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/util/StringEncodingTest.java b/java/common/src/test/java/org/apache/shindig/common/util/StringEncodingTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/util/StringEncodingTest.java
rename to java/common/src/test/java/org/apache/shindig/common/util/StringEncodingTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/util/Utf8UrlCoderTest.java b/java/common/src/test/java/org/apache/shindig/common/util/Utf8UrlCoderTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/util/Utf8UrlCoderTest.java
rename to java/common/src/test/java/org/apache/shindig/common/util/Utf8UrlCoderTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/xml/DomUtilTest.java b/java/common/src/test/java/org/apache/shindig/common/xml/DomUtilTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/xml/DomUtilTest.java
rename to java/common/src/test/java/org/apache/shindig/common/xml/DomUtilTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/common/xml/XmlUtilTest.java b/java/common/src/test/java/org/apache/shindig/common/xml/XmlUtilTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/common/xml/XmlUtilTest.java
rename to java/common/src/test/java/org/apache/shindig/common/xml/XmlUtilTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java b/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java
rename to java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/config/ExpressionContainerConfigTest.java b/java/common/src/test/java/org/apache/shindig/config/ExpressionContainerConfigTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/config/ExpressionContainerConfigTest.java
rename to java/common/src/test/java/org/apache/shindig/config/ExpressionContainerConfigTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java b/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java
rename to java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java b/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java
rename to java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java b/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java
rename to java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/expressions/FunctionsTest.java b/java/common/src/test/java/org/apache/shindig/expressions/FunctionsTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/expressions/FunctionsTest.java
rename to java/common/src/test/java/org/apache/shindig/expressions/FunctionsTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/expressions/OpensocialFunctionsTest.java b/java/common/src/test/java/org/apache/shindig/expressions/OpensocialFunctionsTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/expressions/OpensocialFunctionsTest.java
rename to java/common/src/test/java/org/apache/shindig/expressions/OpensocialFunctionsTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java b/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java
rename to java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/expressions/juel/JuelExpressionsTest.java b/java/common/src/test/java/org/apache/shindig/expressions/juel/JuelExpressionsTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/expressions/juel/JuelExpressionsTest.java
rename to java/common/src/test/java/org/apache/shindig/expressions/juel/JuelExpressionsTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/BaseRequestItemTest.java b/java/common/src/test/java/org/apache/shindig/protocol/BaseRequestItemTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/BaseRequestItemTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/BaseRequestItemTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java b/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java b/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java b/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java b/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java b/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/RestfulCollectionTest.java b/java/common/src/test/java/org/apache/shindig/protocol/RestfulCollectionTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/RestfulCollectionTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/RestfulCollectionTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java b/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java
rename to java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java b/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanFilterTest.java b/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanFilterTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanFilterTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanFilterTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterInjectedClassTest.java b/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterInjectedClassTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterInjectedClassTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterInjectedClassTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java b/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/model/Model.java b/java/common/src/test/java/org/apache/shindig/protocol/model/Model.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/model/Model.java
rename to java/common/src/test/java/org/apache/shindig/protocol/model/Model.java
diff --git a/trunk/java/common/src/test/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParserTest.java b/java/common/src/test/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParserTest.java
similarity index 100%
rename from trunk/java/common/src/test/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParserTest.java
rename to java/common/src/test/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParserTest.java
diff --git a/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt b/java/common/src/test/resources/classpath-accessible-test-file.txt
similarity index 100%
rename from trunk/java/common/src/test/resources/classpath-accessible-test-file.txt
rename to java/common/src/test/resources/classpath-accessible-test-file.txt
diff --git a/trunk/java/common/src/test/resources/logging.properties b/java/common/src/test/resources/logging.properties
similarity index 100%
rename from trunk/java/common/src/test/resources/logging.properties
rename to java/common/src/test/resources/logging.properties
diff --git a/trunk/java/gadgets/README b/java/gadgets/README
similarity index 100%
rename from trunk/java/gadgets/README
rename to java/gadgets/README
diff --git a/trunk/java/gadgets/pom.xml b/java/gadgets/pom.xml
similarity index 100%
rename from trunk/java/gadgets/pom.xml
rename to java/gadgets/pom.xml
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractLockedDomainService.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractLockedDomainService.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractLockedDomainService.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractLockedDomainService.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AuthType.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/AuthType.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AuthType.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/AuthType.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultMessageBundleFactory.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultMessageBundleFactory.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultMessageBundleFactory.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultMessageBundleFactory.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessorImpl.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessorImpl.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessorImpl.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessorImpl.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetELResolver.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetELResolver.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetELResolver.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetELResolver.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsCompileMode.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsCompileMode.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsCompileMode.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/JsCompileMode.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFactory.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFactory.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFactory.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFactory.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RenderingContext.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/RenderingContext.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RenderingContext.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/RenderingContext.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/UnsupportedFeatureException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/UnsupportedFeatureException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/UnsupportedFeatureException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/UnsupportedFeatureException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/UserPrefs.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/UserPrefs.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/UserPrefs.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/UserPrefs.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStore.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStore.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStore.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStore.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ContainerAdminData.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ContainerAdminData.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ContainerAdminData.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ContainerAdminData.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/FeatureAdminData.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/FeatureAdminData.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/FeatureAdminData.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/FeatureAdminData.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminData.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminData.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminData.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminData.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminStore.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminStore.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminStore.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminStore.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/RpcAdminData.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/RpcAdminData.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/RpcAdminData.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/RpcAdminData.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ServerAdminData.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ServerAdminData.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ServerAdminData.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ServerAdminData.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ConfigContributor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ConfigContributor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ConfigContributor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ConfigContributor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ConfigProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ConfigProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ConfigProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ConfigProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/CoreUtilConfigContributor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/CoreUtilConfigContributor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/CoreUtilConfigContributor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/config/CoreUtilConfigContributor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigContributorModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigContributorModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigContributorModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigContributorModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/OsapiServicesConfigContributor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/OsapiServicesConfigContributor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/OsapiServicesConfigContributor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/config/OsapiServicesConfigContributor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ShindigAuthConfigContributor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ShindigAuthConfigContributor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ShindigAuthConfigContributor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ShindigAuthConfigContributor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/XhrwrapperConfigContributor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/XhrwrapperConfigContributor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/XhrwrapperConfigContributor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/config/XhrwrapperConfigContributor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/ApiDirective.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/ApiDirective.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/ApiDirective.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/ApiDirective.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureFile.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureFile.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureFile.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureFile.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureFileSystem.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureFileSystem.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureFileSystem.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureFileSystem.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureRegistryProvider.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureRegistryProvider.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureRegistryProvider.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureRegistryProvider.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureFile.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureFile.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureFile.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureFile.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureFileSystem.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureFileSystem.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureFileSystem.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureFileSystem.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistryProvider.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistryProvider.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistryProvider.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistryProvider.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/TestFeatureRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/TestFeatureRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/TestFeatureRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/features/TestFeatureRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CacheKeyBuilder.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CacheKeyBuilder.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CacheKeyBuilder.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CacheKeyBuilder.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultHttpCache.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultHttpCache.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultHttpCache.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultHttpCache.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpFetcher.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpFetcher.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpFetcher.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpFetcher.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationService.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationService.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationService.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationService.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/NoOpInvalidationService.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/NoOpInvalidationService.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/NoOpInvalidationService.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/NoOpInvalidationService.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/RequestPipeline.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/RequestPipeline.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/RequestPipeline.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/http/RequestPipeline.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/BaseSurfaceJsProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/BaseSurfaceJsProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/BaseSurfaceJsProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/BaseSurfaceJsProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CompilationProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CompilationProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CompilationProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CompilationProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsServingPipeline.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsServingPipeline.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsServingPipeline.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsServingPipeline.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/GetJsContentProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/GetJsContentProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/GetJsContentProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/GetJsContentProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsCompilerModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsCompilerModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsCompilerModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsCompilerModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsContent.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsContent.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsContent.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsContent.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsGadgetContext.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsGadgetContext.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsGadgetContext.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsGadgetContext.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsLoadProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsLoadProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsLoadProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsLoadProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessorRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessorRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessorRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessorRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequestBuilder.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequestBuilder.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequestBuilder.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequestBuilder.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipeline.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipeline.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipeline.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipeline.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipelineModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipelineModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipelineModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipelineModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfo.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfo.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfo.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfo.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfoBuilder.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfoBuilder.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfoBuilder.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfoBuilder.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerKeyAndSecret.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerKeyAndSecret.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerKeyAndSecret.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerKeyAndSecret.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackGenerator.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackGenerator.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackGenerator.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackGenerator.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackState.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackState.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackState.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackState.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackStateToken.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackStateToken.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackStateToken.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackStateToken.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthClientState.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthClientState.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthClientState.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthClientState.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCommandLine.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCommandLine.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCommandLine.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCommandLine.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthError.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthError.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthError.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthError.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfig.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfig.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfig.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfig.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthGadgetContext.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthGadgetContext.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthGadgetContext.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthGadgetContext.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthProtocolException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthProtocolException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthProtocolException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthProtocolException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthStore.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthStore.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthStore.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthStore.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Accessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Accessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Accessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Accessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Message.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Message.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Message.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Message.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2RequestParameterGenerator.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2RequestParameterGenerator.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2RequestParameterGenerator.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2RequestParameterGenerator.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Store.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Store.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Store.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Store.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStore.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStore.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStore.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStore.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Accessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Accessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Accessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Accessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Arguments.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Arguments.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Arguments.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Arguments.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2CallbackState.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2CallbackState.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2CallbackState.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2CallbackState.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2CallbackStateToken.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2CallbackStateToken.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2CallbackStateToken.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2CallbackStateToken.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Error.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Error.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Error.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Error.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2FetcherConfig.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2FetcherConfig.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2FetcherConfig.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2FetcherConfig.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2GadgetContext.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2GadgetContext.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2GadgetContext.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2GadgetContext.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Message.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Message.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Message.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Message.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2MessageModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2MessageModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2MessageModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2MessageModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Module.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Module.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Module.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Module.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Request.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Request.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Request.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Request.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestParameterGenerator.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestParameterGenerator.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestParameterGenerator.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestParameterGenerator.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2ResponseParams.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2ResponseParams.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2ResponseParams.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2ResponseParams.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Store.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Store.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Store.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Store.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Token.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Token.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Token.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Token.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Utils.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Utils.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Utils.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Utils.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/AuthorizationEndpointResponseHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/AuthorizationEndpointResponseHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/AuthorizationEndpointResponseHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/AuthorizationEndpointResponseHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BearerTokenHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BearerTokenHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BearerTokenHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BearerTokenHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ClientAuthenticationHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ClientAuthenticationHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ClientAuthenticationHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ClientAuthenticationHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ClientCredentialsGrantTypeHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ClientCredentialsGrantTypeHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ClientCredentialsGrantTypeHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ClientCredentialsGrantTypeHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/GrantRequestHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/GrantRequestHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/GrantRequestHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/GrantRequestHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/MacTokenHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/MacTokenHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/MacTokenHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/MacTokenHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerError.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerError.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerError.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerError.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ResourceRequestHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ResourceRequestHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ResourceRequestHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ResourceRequestHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/StandardAuthenticationHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/StandardAuthenticationHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/StandardAuthenticationHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/StandardAuthenticationHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenEndpointResponseHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenEndpointResponseHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenEndpointResponseHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenEndpointResponseHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/logger/FilteredLogger.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/logger/FilteredLogger.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/logger/FilteredLogger.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/logger/FilteredLogger.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/MapCache.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/MapCache.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/MapCache.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/MapCache.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Cache.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Cache.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Cache.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Cache.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2CacheException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2CacheException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2CacheException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2CacheException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Client.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Client.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Client.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Client.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Encrypter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Encrypter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Encrypter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Encrypter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2EncryptionException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2EncryptionException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2EncryptionException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2EncryptionException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2PersistenceException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2PersistenceException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2PersistenceException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2PersistenceException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Persister.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Persister.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Persister.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Persister.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistence.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistence.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistence.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistence.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCache.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCache.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCache.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCache.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/NoOpEncrypter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/NoOpEncrypter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/NoOpEncrypter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/NoOpEncrypter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBinding.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBinding.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBinding.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBinding.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2PersistenceModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2PersistenceModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2PersistenceModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2PersistenceModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2Provider.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2Provider.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2Provider.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2Provider.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/HtmlSerialization.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/HtmlSerialization.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/HtmlSerialization.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/HtmlSerialization.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/HtmlSerializer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/HtmlSerializer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/HtmlSerializer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/HtmlSerializer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParser.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParser.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParser.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParser.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssUtils.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssUtils.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssUtils.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssUtils.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlSerializer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlSerializer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlSerializer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlSerializer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlParser.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlParser.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlParser.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlParser.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/cajatest.html b/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/cajatest.html
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/cajatest.html
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/cajatest.html
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderService.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderService.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderService.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderService.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloads.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloads.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloads.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloads.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadedData.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadedData.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadedData.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloadedData.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/Preloader.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/Preloader.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/Preloader.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/Preloader.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloaderService.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloaderService.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloaderService.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PreloaderService.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/ProcessingException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/ProcessingException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/ProcessingException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/process/ProcessingException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/Processor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/Processor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/Processor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/process/Processor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RpcServiceLookup.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RpcServiceLookup.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RpcServiceLookup.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RpcServiceLookup.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ServiceFetcher.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ServiceFetcher.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ServiceFetcher.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ServiceFetcher.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CaptureRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CaptureRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CaptureRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CaptureRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverVisitor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverVisitor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverVisitor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverVisitor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContextAwareRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContextAwareRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContextAwareRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContextAwareRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultResponseRewriterRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultResponseRewriterRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultResponseRewriterRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultResponseRewriterRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/GadgetRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/GadgetRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/GadgetRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/GadgetRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResourceMutateVisitor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResourceMutateVisitor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResourceMutateVisitor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResourceMutateVisitor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriterList.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriterList.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriterList.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriterList.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriterRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriterRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriterRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriterRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritePath.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritePath.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritePath.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritePath.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritingException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritingException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritingException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritingException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/ImageUtils.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/ImageUtils.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/ImageUtils.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/ImageUtils.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/OptimizerConfig.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/OptimizerConfig.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/OptimizerConfig.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/OptimizerConfig.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/PNGOptimizer.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/PNGOptimizer.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/PNGOptimizer.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/PNGOptimizer.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/CompileResult.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/CompileResult.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/CompileResult.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/CompileResult.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompiler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompiler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompiler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompiler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/JsCompiler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/JsCompiler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/JsCompiler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/JsCompiler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AuthenticationModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AuthenticationModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AuthenticationModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AuthenticationModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETagFilter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETagFilter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETagFilter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETagFilter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponse.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponse.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponse.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponse.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCache.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCache.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCache.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCache.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKey.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKey.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKey.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKey.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKeys.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKeys.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKeys.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKeys.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManagerImpl.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManagerImpl.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManagerImpl.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManagerImpl.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuth2CallbackServlet.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuth2CallbackServlet.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuth2CallbackServlet.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuth2CallbackServlet.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcSwfServlet.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcSwfServlet.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcSwfServlet.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcSwfServlet.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ApplicationManifest.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ApplicationManifest.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ApplicationManifest.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ApplicationManifest.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/BaseOAuthService.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/BaseOAuthService.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/BaseOAuthService.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/BaseOAuthService.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ExternalServices.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ExternalServices.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ExternalServices.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ExternalServices.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Icon.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Icon.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Icon.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Icon.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LinkSpec.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LinkSpec.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LinkSpec.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LinkSpec.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuth2Service.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuth2Service.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuth2Service.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuth2Service.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuth2Spec.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuth2Spec.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuth2Spec.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuth2Spec.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/RequestAuthenticationInfo.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/RequestAuthenticationInfo.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/RequestAuthenticationInfo.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/RequestAuthenticationInfo.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/SpecParserException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/SpecParserException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/SpecParserException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/SpecParserException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ElementELResolver.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ElementELResolver.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ElementELResolver.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ElementELResolver.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/MessageELResolver.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/MessageELResolver.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/MessageELResolver.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/MessageELResolver.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NullTemplateLibrary.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NullTemplateLibrary.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NullTemplateLibrary.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NullTemplateLibrary.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TagRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TagRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TagRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TagRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateContext.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateContext.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateContext.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateContext.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateELResolver.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateELResolver.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateELResolver.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateELResolver.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateLibrary.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateLibrary.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateLibrary.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateLibrary.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateLibraryFactory.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateLibraryFactory.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateLibraryFactory.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateLibraryFactory.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateParserException.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateParserException.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateParserException.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateParserException.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateResource.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateResource.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateResource.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateResource.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/AbstractTagRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/AbstractTagRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/AbstractTagRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/AbstractTagRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistry.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistry.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistry.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistry.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/IfTagHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/IfTagHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/IfTagHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/IfTagHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/TagHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/TagHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/TagHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/TagHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/VarTagHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/VarTagHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/VarTagHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/VarTagHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/VariableTagHandler.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/VariableTagHandler.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/VariableTagHandler.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/VariableTagHandler.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AccelUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AccelUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AccelUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AccelUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AllJsIframeVersioner.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AllJsIframeVersioner.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AllJsIframeVersioner.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AllJsIframeVersioner.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsVersioner.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsVersioner.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsVersioner.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsVersioner.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultOAuthUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultOAuthUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultOAuthUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultOAuthUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGenerator.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGenerator.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGenerator.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGenerator.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/IframeUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/IframeUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/IframeUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/IframeUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/LockedDomainPrefixGenerator.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/LockedDomainPrefixGenerator.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/LockedDomainPrefixGenerator.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/LockedDomainPrefixGenerator.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/OAuthUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/OAuthUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/OAuthUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/OAuthUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriManager.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriManager.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriManager.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriStatus.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriStatus.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriStatus.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriStatus.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/BidiSubstituter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/BidiSubstituter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/BidiSubstituter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/BidiSubstituter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/MessageSubstituter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/MessageSubstituter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/MessageSubstituter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/MessageSubstituter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/ModuleSubstituter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/ModuleSubstituter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/ModuleSubstituter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/ModuleSubstituter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substituter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substituter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substituter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substituter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/SubstituterModule.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/SubstituterModule.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/SubstituterModule.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/SubstituterModule.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substitutions.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substitutions.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substitutions.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substitutions.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/UserPrefSubstituter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/UserPrefSubstituter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/UserPrefSubstituter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/UserPrefSubstituter.java
diff --git a/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/VariableSubstituter.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/VariableSubstituter.java
similarity index 100%
rename from trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/VariableSubstituter.java
rename to java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/VariableSubstituter.java
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ar.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ar.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ar.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ar.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ca.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ca.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ca.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ca.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_cs.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_cs.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_cs.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_cs.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_da.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_da.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_da.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_da.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_de.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_de.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_de.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_de.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_el.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_el.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_el.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_el.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_en_US.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_en_US.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_en_US.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_en_US.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_es.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_es.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_es.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_es.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_fi.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_fi.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_fi.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_fi.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_fr.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_fr.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_fr.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_fr.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_hu.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_hu.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_hu.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_hu.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_it.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_it.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_it.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_it.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_iw.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_iw.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_iw.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_iw.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ja.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ja.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ja.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ja.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_kk.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_kk.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_kk.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_kk.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ko.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ko.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ko.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ko.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_nl.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_nl.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_nl.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_nl.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_no.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_no.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_no.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_no.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pl.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pl.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pl.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pl.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pt.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pt.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pt.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pt.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pt_BR.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pt_BR.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pt_BR.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_pt_BR.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ru.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ru.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ru.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_ru.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_sl.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_sl.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_sl.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_sl.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_sv.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_sv.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_sv.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_sv.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_th.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_th.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_th.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_th.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_tr.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_tr.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_tr.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_tr.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_zh.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_zh.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_zh.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_zh.properties
diff --git a/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_zh_TW.properties b/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_zh_TW.properties
similarity index 100%
rename from trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_zh_TW.properties
rename to java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_zh_TW.properties
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/AuthTypeTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/AuthTypeTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/AuthTypeTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/AuthTypeTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FeedProcessorImplTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/FeedProcessorImplTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FeedProcessorImplTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/FeedProcessorImplTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FetchResponseUtilsTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/FetchResponseUtilsTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FetchResponseUtilsTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/FetchResponseUtilsTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetELResolverTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetELResolverTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetELResolverTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetELResolverTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsCompileModeTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsCompileModeTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsCompileModeTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/JsCompileModeTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/ContainerAdminDataTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/ContainerAdminDataTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/ContainerAdminDataTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/ContainerAdminDataTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/FeatureAdminDataTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/FeatureAdminDataTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/FeatureAdminDataTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/FeatureAdminDataTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/GadgetAdminDataTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/GadgetAdminDataTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/GadgetAdminDataTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/GadgetAdminDataTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/RpcAdminDataTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/RpcAdminDataTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/RpcAdminDataTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/RpcAdminDataTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/ServerAdminDataTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/ServerAdminDataTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/ServerAdminDataTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/ServerAdminDataTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/config/DefaultConfigProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/config/DefaultConfigProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/config/DefaultConfigProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/config/DefaultConfigProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/encoding/EncodingDetectorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/encoding/EncodingDetectorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/encoding/EncodingDetectorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/encoding/EncodingDetectorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureResourceLoaderTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureResourceLoaderTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureResourceLoaderTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureResourceLoaderTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpCacheTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpCacheTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpCacheTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpCacheTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpFetcherTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpFetcherTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpFetcherTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpFetcherTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/CacheKeyBuilderTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/CacheKeyBuilderTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/CacheKeyBuilderTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/CacheKeyBuilderTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultHttpCacheTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultHttpCacheTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultHttpCacheTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultHttpCacheTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultRequestPipelineTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultRequestPipelineTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultRequestPipelineTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultRequestPipelineTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EchoServer.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EchoServer.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EchoServer.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EchoServer.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/FakeHttpServer.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/FakeHttpServer.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/FakeHttpServer.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/FakeHttpServer.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelperTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelperTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelperTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelperTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/InvalidationHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/InvalidationHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/InvalidationHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/InvalidationHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcherTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcherTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcherTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcherTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CompilationProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CompilationProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CompilationProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CompilationProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsServingPipelineTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsServingPipelineTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsServingPipelineTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsServingPipelineTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferJsProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferJsProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferJsProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferJsProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsLoadProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsLoadProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsLoadProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsLoadProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsRequestBuilderTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsRequestBuilderTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsRequestBuilderTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsRequestBuilderTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthClientStateTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthClientStateTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthClientStateTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthClientStateTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfigTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfigTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfigTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfigTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2StoreTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2StoreTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2StoreTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2StoreTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStoreTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStoreTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStoreTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStoreTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/MockUtils.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/MockUtils.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/MockUtils.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/MockUtils.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ArgumentsTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ArgumentsTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ArgumentsTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ArgumentsTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ErrorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ErrorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ErrorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ErrorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2FetcherConfigTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2FetcherConfigTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2FetcherConfigTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2FetcherConfigTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2GadgetContextTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2GadgetContextTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2GadgetContextTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2GadgetContextTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2MessageModuleTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2MessageModuleTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2MessageModuleTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2MessageModuleTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ModuleTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ModuleTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ModuleTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ModuleTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestExceptionTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestExceptionTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestExceptionTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestExceptionTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ResponseParamsTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ResponseParamsTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ResponseParamsTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ResponseParamsTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/BearerTokenHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/BearerTokenHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/BearerTokenHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/BearerTokenHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/ClientCredentialsGrantTypeHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/ClientCredentialsGrantTypeHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/ClientCredentialsGrantTypeHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/ClientCredentialsGrantTypeHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/MacTokenHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/MacTokenHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/MacTokenHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/MacTokenHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerErrorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerErrorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerErrorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerErrorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerModuleTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerModuleTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerModuleTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerModuleTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/StandardAuthenticationHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/StandardAuthenticationHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/StandardAuthenticationHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/StandardAuthenticationHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/logger/FilteredLoggerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/logger/FilteredLoggerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/logger/FilteredLoggerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/logger/FilteredLoggerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2CacheExceptionTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2CacheExceptionTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2CacheExceptionTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2CacheExceptionTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2ClientTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2ClientTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2ClientTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2ClientTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2EncryptionExceptionTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2EncryptionExceptionTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2EncryptionExceptionTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2EncryptionExceptionTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2PersistenceExceptionTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2PersistenceExceptionTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2PersistenceExceptionTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2PersistenceExceptionTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistenceTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistenceTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistenceTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistenceTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCacheTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCacheTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCacheTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCacheTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2PersisterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2PersisterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2PersisterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2PersisterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/NoOpEncrypterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/NoOpEncrypterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/NoOpEncrypterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/NoOpEncrypterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBindingTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBindingTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBindingTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBindingTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2PersistenceModuleTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2PersistenceModuleTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2PersistenceModuleTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2PersistenceModuleTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2ProviderTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2ProviderTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2ProviderTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2ProviderTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCompactHtmlSerializerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCompactHtmlSerializerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCompactHtmlSerializerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCompactHtmlSerializerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParserTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParserTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParserTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParserTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssParserTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssParserTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssParserTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssParserTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaParserAndSerializerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaParserAndSerializerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaParserAndSerializerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaParserAndSerializerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlParserTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlParserTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlParserTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlParserTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoCompactHtmlSerializerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoCompactHtmlSerializerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoCompactHtmlSerializerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoCompactHtmlSerializerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoParserAndSerializeTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoParserAndSerializeTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoParserAndSerializeTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoParserAndSerializeTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/SocialMarkupHtmlParserTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/SocialMarkupHtmlParserTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/SocialMarkupHtmlParserTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/SocialMarkupHtmlParserTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloadsTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloadsTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloadsTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloadsTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/CajaResponseRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/CajaResponseRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/CajaResponseRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/CajaResponseRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/FakeMessageBundleFactory.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/FakeMessageBundleFactory.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/FakeMessageBundleFactory.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/FakeMessageBundleFactory.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RendererTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RendererTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RendererTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RendererTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContextAwareRegistryTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContextAwareRegistryTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContextAwareRegistryTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContextAwareRegistryTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriteModuleTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriteModuleTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriteModuleTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriteModuleTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterUtilsTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterUtilsTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterUtilsTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterUtilsTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/XPathWrapper.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/XPathWrapper.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/XPathWrapper.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/XPathWrapper.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtilsTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtilsTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtilsTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtilsTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/OptimizerConfigTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/OptimizerConfigTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/OptimizerConfigTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/OptimizerConfigTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/PNGOptimizerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/PNGOptimizerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/PNGOptimizerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/PNGOptimizerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETagFilterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETagFilterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETagFilterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETagFilterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponseTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponseTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponseTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponseTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/FakeIframeUriManager.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/FakeIframeUriManager.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/FakeIframeUriManager.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/FakeIframeUriManager.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/FakeProcessor.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/FakeProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/FakeProcessor.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/FakeProcessor.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestServletTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestServletTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestServletTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestServletTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ModuleCacheTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ModuleCacheTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ModuleCacheTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ModuleCacheTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/RpcServletTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/RpcServletTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/RpcServletTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/RpcServletTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ApplicationManifestTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ApplicationManifestTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ApplicationManifestTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ApplicationManifestTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LinkSpecTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LinkSpecTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LinkSpecTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LinkSpecTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthServiceTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthServiceTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthServiceTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthServiceTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthSpecTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthSpecTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthSpecTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthSpecTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/MessageELResolverTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/MessageELResolverTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/MessageELResolverTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/MessageELResolverTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/TemplateLibraryFactoryTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/TemplateLibraryFactoryTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/TemplateLibraryFactoryTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/TemplateLibraryFactoryTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistryTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistryTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistryTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistryTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistryTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistryTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistryTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistryTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/IfTagHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/IfTagHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/IfTagHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/IfTagHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/VarTagHandlerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/VarTagHandlerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/VarTagHandlerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/VarTagHandlerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/AllJsIframeVersionerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/AllJsIframeVersionerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/AllJsIframeVersionerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/AllJsIframeVersionerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsVersionerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsVersionerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsVersionerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsVersionerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultOAuthUriManagerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultOAuthUriManagerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultOAuthUriManagerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultOAuthUriManagerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGeneratorTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGeneratorTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGeneratorTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGeneratorTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/PassthruManager.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/PassthruManager.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/PassthruManager.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/PassthruManager.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/ProxyUriBaseTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/ProxyUriBaseTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/ProxyUriBaseTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/ProxyUriBaseTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/ProxyUriManagerTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/ProxyUriManagerTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/ProxyUriManagerTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/ProxyUriManagerTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriManagerTestBase.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriManagerTestBase.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriManagerTestBase.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriManagerTestBase.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/MessageSubstituterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/MessageSubstituterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/MessageSubstituterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/MessageSubstituterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/ModuleSubstituterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/ModuleSubstituterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/ModuleSubstituterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/ModuleSubstituterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java
diff --git a/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java b/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
similarity index 100%
rename from trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
rename to java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
diff --git a/trunk/java/gadgets/src/test/resources/logging.properties b/java/gadgets/src/test/resources/logging.properties
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/logging.properties
rename to java/gadgets/src/test/resources/logging.properties
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/oauth2/oauth2_test.json b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/oauth2/oauth2_test.json
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/oauth2/oauth2_test.json
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/oauth2/oauth2_test.json
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fragment-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fragment-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fragment-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fragment-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fragment.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fragment.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fragment.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fragment.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fulldocnodoctype-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fulldocnodoctype-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fulldocnodoctype-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fulldocnodoctype-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fulldocnodoctype.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fulldocnodoctype.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fulldocnodoctype.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-fulldocnodoctype.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-headnobody-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-headnobody-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-headnobody-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-headnobody-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-headnobody.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-headnobody.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-headnobody.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-headnobody.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment2-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment2-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment2-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment2-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment2.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment2.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment2.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fragment2.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fulldocnodoctype-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fulldocnodoctype-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fulldocnodoctype-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fulldocnodoctype-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fulldocnodoctype.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fulldocnodoctype.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fulldocnodoctype.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-fulldocnodoctype.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-headnobody-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-headnobody-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-headnobody-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-headnobody-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-headnobody.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-headnobody.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-headnobody.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-headnobody.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-socialmarkup.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-socialmarkup.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-socialmarkup.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-socialmarkup.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-startswithcomment-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-startswithcomment-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-startswithcomment-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-startswithcomment-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-startswithcomment.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-startswithcomment.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-startswithcomment.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-startswithcomment.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-text-before-script-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-text-before-script-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-text-before-script-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-text-before-script-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-text-before-script.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-text-before-script.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-text-before-script.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-text-before-script.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-ampersands-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-ampersands-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-ampersands-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-ampersands-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-ampersands.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-ampersands.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-ampersands.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-ampersands.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-iecond-comments-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-iecond-comments-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-iecond-comments-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-iecond-comments-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-iecond-comments.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-iecond-comments.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-iecond-comments.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-iecond-comments.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/OSML_test.xml b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/OSML_test.xml
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/OSML_test.xml
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/OSML_test.xml
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/2ndjpgbad.jpg b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/2ndjpgbad.jpg
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/2ndjpgbad.jpg
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/2ndjpgbad.jpg
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/animated.gif b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/animated.gif
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/animated.gif
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/animated.gif
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/bad.jpg b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/bad.jpg
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/bad.jpg
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/bad.jpg
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc.jpg b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc.jpg
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc.jpg
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc.jpg
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc2.jpg b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc2.jpg
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc2.jpg
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc2.jpg
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc3.jpg b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc3.jpg
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc3.jpg
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc3.jpg
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc4.jpg b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc4.jpg
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc4.jpg
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/badicc4.jpg
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/directcolor.gif b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/directcolor.gif
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/directcolor.gif
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/directcolor.gif
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/dog.gif b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/dog.gif
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/dog.gif
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/dog.gif
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil.bmp b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil.bmp
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil.bmp
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil.bmp
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil.png b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil.png
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil.png
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil.png
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil2.bmp b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil2.bmp
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil2.bmp
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/evil2.bmp
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/expand.gif b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/expand.gif
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/expand.gif
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/expand.gif
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/huge.gif b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/huge.gif
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/huge.gif
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/huge.gif
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/inefficient.png b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/inefficient.png
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/inefficient.png
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/inefficient.png
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/large.gif b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/large.gif
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/large.gif
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/large.gif
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/large.jpg b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/large.jpg
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/large.jpg
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/large.jpg
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/ratio.gif b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/ratio.gif
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/ratio.gif
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/ratio.gif
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/rgbawithnoalpha.png b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/rgbawithnoalpha.png
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/rgbawithnoalpha.png
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/rgbawithnoalpha.png
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/simple.bmp b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/simple.bmp
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/simple.bmp
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/simple.bmp
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/small.jpg b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/small.jpg
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/small.jpg
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/small.jpg
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImage420.jpg b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImage420.jpg
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImage420.jpg
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImage420.jpg
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImage444.jpg b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImage444.jpg
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImage444.jpg
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImage444.jpg
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImageNotHuffmanOptimized.jpg b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImageNotHuffmanOptimized.jpg
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImageNotHuffmanOptimized.jpg
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImageNotHuffmanOptimized.jpg
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/unanimated.gif b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/unanimated.gif
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/unanimated.gif
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/unanimated.gif
Binary files differ
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic.css b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic.css
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic.css
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic.css
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritelinksbasic.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritelinksbasic.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritelinksbasic.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritelinksbasic.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritescriptbasic.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritescriptbasic.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritescriptbasic.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritescriptbasic.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestyle2-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestyle2-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestyle2-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestyle2-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestyle2.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestyle2.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestyle2.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestyle2.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylebasic.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylebasic.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylebasic.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylebasic.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylemedia-expected.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylemedia-expected.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylemedia-expected.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylemedia-expected.html
diff --git a/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylemedia.html b/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylemedia.html
similarity index 100%
rename from trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylemedia.html
rename to java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritestylemedia.html
diff --git a/trunk/java/sample-container/pom.xml b/java/sample-container/pom.xml
similarity index 100%
rename from trunk/java/sample-container/pom.xml
rename to java/sample-container/pom.xml
diff --git a/trunk/java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java b/java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java
similarity index 100%
rename from trunk/java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java
rename to java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java
diff --git a/trunk/java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java b/java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java
similarity index 100%
rename from trunk/java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java
rename to java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java
diff --git a/trunk/java/sample-container/src/main/java/org/apache/shindig/sample/shiro/SampleShiroRealm.java b/java/sample-container/src/main/java/org/apache/shindig/sample/shiro/SampleShiroRealm.java
similarity index 100%
rename from trunk/java/sample-container/src/main/java/org/apache/shindig/sample/shiro/SampleShiroRealm.java
rename to java/sample-container/src/main/java/org/apache/shindig/sample/shiro/SampleShiroRealm.java
diff --git a/trunk/java/sample-container/src/main/java/org/apache/shindig/sample/shiro/ShiroGuiceModule.java b/java/sample-container/src/main/java/org/apache/shindig/sample/shiro/ShiroGuiceModule.java
similarity index 100%
rename from trunk/java/sample-container/src/main/java/org/apache/shindig/sample/shiro/ShiroGuiceModule.java
rename to java/sample-container/src/main/java/org/apache/shindig/sample/shiro/ShiroGuiceModule.java
diff --git a/trunk/java/sample-maven-archetype/pom.xml b/java/sample-maven-archetype/pom.xml
similarity index 100%
rename from trunk/java/sample-maven-archetype/pom.xml
rename to java/sample-maven-archetype/pom.xml
diff --git a/trunk/java/sample-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/java/sample-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from trunk/java/sample-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to java/sample-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/pom.xml b/java/sample-maven-archetype/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/pom.xml
rename to java/sample-maven-archetype/src/main/resources/archetype-resources/pom.xml
diff --git a/trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/resources/shindig.properties b/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/resources/shindig.properties
similarity index 100%
rename from trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/resources/shindig.properties
rename to java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/resources/shindig.properties
diff --git a/trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
rename to java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html b/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
similarity index 100%
rename from trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
rename to java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
diff --git a/trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/myFirstGadget.xml b/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/myFirstGadget.xml
similarity index 100%
rename from trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/myFirstGadget.xml
rename to java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webapp/myFirstGadget.xml
diff --git a/trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webresources/css/gadgets.css b/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webresources/css/gadgets.css
similarity index 100%
rename from trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webresources/css/gadgets.css
rename to java/sample-maven-archetype/src/main/resources/archetype-resources/src/main/webresources/css/gadgets.css
diff --git a/trunk/java/server-dependencies/pom.xml b/java/server-dependencies/pom.xml
similarity index 100%
rename from trunk/java/server-dependencies/pom.xml
rename to java/server-dependencies/pom.xml
diff --git a/trunk/java/server-resources/pom.xml b/java/server-resources/pom.xml
similarity index 100%
rename from trunk/java/server-resources/pom.xml
rename to java/server-resources/pom.xml
diff --git a/trunk/java/server-resources/src/main/webapp/WEB-INF/authorize.jsp b/java/server-resources/src/main/webapp/WEB-INF/authorize.jsp
similarity index 100%
rename from trunk/java/server-resources/src/main/webapp/WEB-INF/authorize.jsp
rename to java/server-resources/src/main/webapp/WEB-INF/authorize.jsp
diff --git a/trunk/java/server-resources/src/main/webapp/WEB-INF/web.xml b/java/server-resources/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from trunk/java/server-resources/src/main/webapp/WEB-INF/web.xml
rename to java/server-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/trunk/java/server-resources/src/main/webapp/login.jsp b/java/server-resources/src/main/webapp/login.jsp
similarity index 100%
rename from trunk/java/server-resources/src/main/webapp/login.jsp
rename to java/server-resources/src/main/webapp/login.jsp
diff --git a/trunk/java/server/README b/java/server/README
similarity index 100%
rename from trunk/java/server/README
rename to java/server/README
diff --git a/trunk/java/server/pom.xml b/java/server/pom.xml
similarity index 100%
rename from trunk/java/server/pom.xml
rename to java/server/pom.xml
diff --git a/trunk/java/server/src/main/appended-resources/META-INF/LICENSE b/java/server/src/main/appended-resources/META-INF/LICENSE
similarity index 100%
rename from trunk/java/server/src/main/appended-resources/META-INF/LICENSE
rename to java/server/src/main/appended-resources/META-INF/LICENSE
diff --git a/trunk/java/server/src/main/appended-resources/META-INF/NOTICE b/java/server/src/main/appended-resources/META-INF/NOTICE
similarity index 100%
rename from trunk/java/server/src/main/appended-resources/META-INF/NOTICE
rename to java/server/src/main/appended-resources/META-INF/NOTICE
diff --git a/trunk/java/server/src/main/webapp/META-INF/MANIFEST.MF b/java/server/src/main/webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from trunk/java/server/src/main/webapp/META-INF/MANIFEST.MF
rename to java/server/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/AllJsFilter.java b/java/server/src/test/java/org/apache/shindig/server/endtoend/AllJsFilter.java
similarity index 100%
rename from trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/AllJsFilter.java
rename to java/server/src/test/java/org/apache/shindig/server/endtoend/AllJsFilter.java
diff --git a/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java b/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
similarity index 100%
rename from trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
rename to java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
diff --git a/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java b/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
similarity index 100%
rename from trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
rename to java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
diff --git a/trunk/java/server/src/test/resources/endtoend/cajaTest.xml b/java/server/src/test/resources/endtoend/cajaTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/cajaTest.xml
rename to java/server/src/test/resources/endtoend/cajaTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/errorTest.xml b/java/server/src/test/resources/endtoend/errorTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/errorTest.xml
rename to java/server/src/test/resources/endtoend/errorTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/failCajaTest.xml b/java/server/src/test/resources/endtoend/failCajaTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/failCajaTest.xml
rename to java/server/src/test/resources/endtoend/failCajaTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/failCajaUrlTest.xml b/java/server/src/test/resources/endtoend/failCajaUrlTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/failCajaUrlTest.xml
rename to java/server/src/test/resources/endtoend/failCajaUrlTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml b/java/server/src/test/resources/endtoend/fetchPeopleTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml
rename to java/server/src/test/resources/endtoend/fetchPeopleTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml b/java/server/src/test/resources/endtoend/fetchPersonTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml
rename to java/server/src/test/resources/endtoend/fetchPersonTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/jsonTest.xml b/java/server/src/test/resources/endtoend/jsonTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/jsonTest.xml
rename to java/server/src/test/resources/endtoend/jsonTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/makeRequestTest.xml b/java/server/src/test/resources/endtoend/makeRequestTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/makeRequestTest.xml
rename to java/server/src/test/resources/endtoend/makeRequestTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/messageBundle.xml b/java/server/src/test/resources/endtoend/messageBundle.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/messageBundle.xml
rename to java/server/src/test/resources/endtoend/messageBundle.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/messages.xml b/java/server/src/test/resources/endtoend/messages.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/messages.xml
rename to java/server/src/test/resources/endtoend/messages.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/messages_ar.xml b/java/server/src/test/resources/endtoend/messages_ar.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/messages_ar.xml
rename to java/server/src/test/resources/endtoend/messages_ar.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/opensocial-templates/compiler_test.js b/java/server/src/test/resources/endtoend/opensocial-templates/compiler_test.js
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/opensocial-templates/compiler_test.js
rename to java/server/src/test/resources/endtoend/opensocial-templates/compiler_test.js
diff --git a/trunk/java/server/src/test/resources/endtoend/opensocial-templates/container_test.js b/java/server/src/test/resources/endtoend/opensocial-templates/container_test.js
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/opensocial-templates/container_test.js
rename to java/server/src/test/resources/endtoend/opensocial-templates/container_test.js
diff --git a/trunk/java/server/src/test/resources/endtoend/opensocial-templates/loader_test.js b/java/server/src/test/resources/endtoend/opensocial-templates/loader_test.js
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/opensocial-templates/loader_test.js
rename to java/server/src/test/resources/endtoend/opensocial-templates/loader_test.js
diff --git a/trunk/java/server/src/test/resources/endtoend/opensocial-templates/os_test.js b/java/server/src/test/resources/endtoend/opensocial-templates/os_test.js
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/opensocial-templates/os_test.js
rename to java/server/src/test/resources/endtoend/opensocial-templates/os_test.js
diff --git a/trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml b/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml
rename to java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/opensocial-templates/testadapter.js b/java/server/src/test/resources/endtoend/opensocial-templates/testadapter.js
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/opensocial-templates/testadapter.js
rename to java/server/src/test/resources/endtoend/opensocial-templates/testadapter.js
diff --git a/trunk/java/server/src/test/resources/endtoend/opensocial-templates/util_test.js b/java/server/src/test/resources/endtoend/opensocial-templates/util_test.js
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/opensocial-templates/util_test.js
rename to java/server/src/test/resources/endtoend/opensocial-templates/util_test.js
diff --git a/trunk/java/server/src/test/resources/endtoend/osapi/activitiesTest.xml b/java/server/src/test/resources/endtoend/osapi/activitiesTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/osapi/activitiesTest.xml
rename to java/server/src/test/resources/endtoend/osapi/activitiesTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/osapi/appdataTest.xml b/java/server/src/test/resources/endtoend/osapi/appdataTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/osapi/appdataTest.xml
rename to java/server/src/test/resources/endtoend/osapi/appdataTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/osapi/batchTest.xml b/java/server/src/test/resources/endtoend/osapi/batchTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/osapi/batchTest.xml
rename to java/server/src/test/resources/endtoend/osapi/batchTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/osapi/errorTest.xml b/java/server/src/test/resources/endtoend/osapi/errorTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/osapi/errorTest.xml
rename to java/server/src/test/resources/endtoend/osapi/errorTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/osapi/peopleTest.xml b/java/server/src/test/resources/endtoend/osapi/peopleTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/osapi/peopleTest.xml
rename to java/server/src/test/resources/endtoend/osapi/peopleTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/osapi/personTest.xml b/java/server/src/test/resources/endtoend/osapi/personTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/osapi/personTest.xml
rename to java/server/src/test/resources/endtoend/osapi/personTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/pipeliningTest.xml b/java/server/src/test/resources/endtoend/pipeliningTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/pipeliningTest.xml
rename to java/server/src/test/resources/endtoend/pipeliningTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/templateLibrary.xml b/java/server/src/test/resources/endtoend/templateLibrary.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/templateLibrary.xml
rename to java/server/src/test/resources/endtoend/templateLibrary.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/templateRewriter.xml b/java/server/src/test/resources/endtoend/templateRewriter.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/templateRewriter.xml
rename to java/server/src/test/resources/endtoend/templateRewriter.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/test.json b/java/server/src/test/resources/endtoend/test.json
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/test.json
rename to java/server/src/test/resources/endtoend/test.json
diff --git a/trunk/java/server/src/test/resources/endtoend/testLibrary.xml b/java/server/src/test/resources/endtoend/testLibrary.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/testLibrary.xml
rename to java/server/src/test/resources/endtoend/testLibrary.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/testframework.js b/java/server/src/test/resources/endtoend/testframework.js
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/testframework.js
rename to java/server/src/test/resources/endtoend/testframework.js
diff --git a/trunk/java/server/src/test/resources/endtoend/viewLevelElementsTest.xml b/java/server/src/test/resources/endtoend/viewLevelElementsTest.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/viewLevelElementsTest.xml
rename to java/server/src/test/resources/endtoend/viewLevelElementsTest.xml
diff --git a/trunk/java/server/src/test/resources/endtoend/viewMessages.xml b/java/server/src/test/resources/endtoend/viewMessages.xml
similarity index 100%
rename from trunk/java/server/src/test/resources/endtoend/viewMessages.xml
rename to java/server/src/test/resources/endtoend/viewMessages.xml
diff --git a/trunk/java/social-api/pom.xml b/java/social-api/pom.xml
similarity index 100%
rename from trunk/java/social-api/pom.xml
rename to java/social-api/pom.xml
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java b/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/core/config/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/config/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AccountImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/AccountImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AccountImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/AccountImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityObjectImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityObjectImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityObjectImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityObjectImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AlbumImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/AlbumImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AlbumImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/AlbumImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/GroupImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/GroupImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/GroupImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/GroupImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaLinkImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaLinkImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaLinkImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaLinkImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageCollectionImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageCollectionImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageCollectionImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageCollectionImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/UrlImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/UrlImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/UrlImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/UrlImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/model/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthValidatorProvider.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthValidatorProvider.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthValidatorProvider.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthValidatorProvider.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2AuthenticationHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2AuthenticationHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2AuthenticationHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2AuthenticationHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2AuthorizationHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2AuthorizationHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2AuthorizationHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2AuthorizationHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Client.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Client.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Client.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Client.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Code.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Code.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Code.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Code.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataService.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataService.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataService.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataService.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataServiceImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataServiceImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataServiceImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataServiceImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Exception.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Exception.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Exception.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Exception.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedRequest.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedRequest.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedRequest.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedRequest.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedResponse.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedResponse.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedResponse.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedResponse.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Service.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Service.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Service.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Service.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2ServiceImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2ServiceImpl.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2ServiceImpl.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2ServiceImpl.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2TokenHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2TokenHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2TokenHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2TokenHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Types.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Types.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Types.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Types.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Utils.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Utils.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Utils.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Utils.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AccessTokenRequestValidator.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AccessTokenRequestValidator.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AccessTokenRequestValidator.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AccessTokenRequestValidator.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AuthCodeGrantValidator.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AuthCodeGrantValidator.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AuthCodeGrantValidator.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AuthCodeGrantValidator.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AuthorizationCodeRequestValidator.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AuthorizationCodeRequestValidator.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AuthorizationCodeRequestValidator.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/AuthorizationCodeRequestValidator.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/ClientCredentialsGrantValidator.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/ClientCredentialsGrantValidator.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/ClientCredentialsGrantValidator.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/ClientCredentialsGrantValidator.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/DefaultResourceRequestValidator.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/DefaultResourceRequestValidator.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/DefaultResourceRequestValidator.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/DefaultResourceRequestValidator.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2GrantValidator.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2GrantValidator.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2GrantValidator.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2GrantValidator.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2ProtectedResourceValidator.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2ProtectedResourceValidator.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2ProtectedResourceValidator.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2ProtectedResourceValidator.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2RequestValidator.java b/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2RequestValidator.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2RequestValidator.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/OAuth2RequestValidator.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamAtomConverter.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamAtomConverter.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamAtomConverter.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamAtomConverter.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttribute.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttribute.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttribute.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttribute.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttributeConverter.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttributeConverter.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttributeConverter.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttributeConverter.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAuthor.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAuthor.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAuthor.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAuthor.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomEntry.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomEntry.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomEntry.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomEntry.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomGenerator.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomGenerator.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomGenerator.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomGenerator.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomKeyValue.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomKeyValue.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomKeyValue.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomKeyValue.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLink.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLink.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLink.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLink.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSummary.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSummary.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSummary.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSummary.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSummaryConverter.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSummaryConverter.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSummaryConverter.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSummaryConverter.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Account.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Account.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Account.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Account.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityObject.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityObject.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityObject.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityObject.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Album.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Album.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Album.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Album.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Drinker.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Drinker.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Drinker.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Drinker.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Group.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Group.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Group.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Group.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/LookingFor.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/LookingFor.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/LookingFor.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/LookingFor.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaLink.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaLink.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaLink.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaLink.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageCollection.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageCollection.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageCollection.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageCollection.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NetworkPresence.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NetworkPresence.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NetworkPresence.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NetworkPresence.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Smoker.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Smoker.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Smoker.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Smoker.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthEntry.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthEntry.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthEntry.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthEntry.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AlbumHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AlbumHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AlbumHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AlbumHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/GroupHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/GroupHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/GroupHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/GroupHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityStreamService.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityStreamService.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityStreamService.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityStreamService.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/DomainName.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/DomainName.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/DomainName.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/DomainName.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GlobalId.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GlobalId.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GlobalId.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GlobalId.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupService.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupService.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupService.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupService.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/LocalId.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/LocalId.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/LocalId.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/LocalId.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ObjectId.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ObjectId.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ObjectId.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ObjectId.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java b/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java
rename to java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java b/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java
rename to java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java b/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
rename to java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/sample/service/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/sample/service/package-info.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java b/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
rename to java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
diff --git a/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/package-info.java b/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/package-info.java
similarity index 100%
rename from trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/package-info.java
rename to java/social-api/src/main/java/org/apache/shindig/social/sample/spi/package-info.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java b/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
rename to java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java b/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java b/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/FakeOAuthRequest.java b/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/FakeOAuthRequest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/FakeOAuthRequest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/core/oauth/FakeOAuthRequest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/MockServletOutputStream.java b/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/MockServletOutputStream.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/MockServletOutputStream.java
rename to java/social-api/src/test/java/org/apache/shindig/social/core/oauth/MockServletOutputStream.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java b/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthenticationHandlerTest.java b/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthenticationHandlerTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthenticationHandlerTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthenticationHandlerTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ClientCredentialFlowTest.java b/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ClientCredentialFlowTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ClientCredentialFlowTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ClientCredentialFlowTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ImplicitFlowTest.java b/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ImplicitFlowTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ImplicitFlowTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ImplicitFlowTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHanderTest.java b/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHanderTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHanderTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHanderTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulAtomActivityEntryTest.java b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulAtomActivityEntryTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulAtomActivityEntryTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulAtomActivityEntryTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityEntryTest.java b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityEntryTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityEntryTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityEntryTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonDataTest.java b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonDataTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonDataTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonDataTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityEntryTest.java b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityEntryTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityEntryTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityEntryTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/TestUtils.java b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/TestUtils.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/TestUtils.java
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/TestUtils.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryAtomId.xml b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryAtomId.xml
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryAtomId.xml
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryAtomId.xml
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryAtomIds.xml b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryAtomIds.xml
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryAtomIds.xml
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryAtomIds.xml
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonCreated.json b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonCreated.json
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonCreated.json
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonCreated.json
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonDelete.json b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonDelete.json
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonDelete.json
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonDelete.json
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonExtension.json b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonExtension.json
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonExtension.json
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonExtension.json
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonGroup.json b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonGroup.json
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonGroup.json
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonGroup.json
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonId.json b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonId.json
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonId.json
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonId.json
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonIds.json b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonIds.json
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonIds.json
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonIds.json
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonUpdated.json b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonUpdated.json
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonUpdated.json
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonUpdated.json
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryXmlId.xml b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryXmlId.xml
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryXmlId.xml
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryXmlId.xml
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryXmlIds.xml b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryXmlIds.xml
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryXmlIds.xml
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryXmlIds.xml
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityStreamsSupportedFields.json b/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityStreamsSupportedFields.json
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityStreamsSupportedFields.json
rename to java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityStreamsSupportedFields.json
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/model/PersonTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/model/PersonTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/model/PersonTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/model/PersonTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandlerTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandlerTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandlerTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandlerTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ResponseItemTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ResponseItemTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ResponseItemTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ResponseItemTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/SocialRequestItemTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/SocialRequestItemTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/SocialRequestItemTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/SocialRequestItemTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/CollectionOptionsTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/CollectionOptionsTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/CollectionOptionsTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/CollectionOptionsTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DomainNameTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DomainNameTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DomainNameTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DomainNameTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GlobalIdTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GlobalIdTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GlobalIdTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GlobalIdTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/LocalIdTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/LocalIdTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/LocalIdTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/LocalIdTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/ObjectIdTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/ObjectIdTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/ObjectIdTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/ObjectIdTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/UserIdTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/UserIdTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/UserIdTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/UserIdTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidatorTest.java b/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidatorTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidatorTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidatorTest.java
diff --git a/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java b/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
similarity index 100%
rename from trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
rename to java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
diff --git a/trunk/java/social-api/src/test/resources/log4j.properties b/java/social-api/src/test/resources/log4j.properties
similarity index 100%
rename from trunk/java/social-api/src/test/resources/log4j.properties
rename to java/social-api/src/test/resources/log4j.properties
diff --git a/trunk/java/social-api/src/test/resources/logging.properties b/java/social-api/src/test/resources/logging.properties
similarity index 100%
rename from trunk/java/social-api/src/test/resources/logging.properties
rename to java/social-api/src/test/resources/logging.properties
diff --git a/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd b/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd
similarity index 100%
rename from trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd
rename to java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd
diff --git a/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testschema1.xml b/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testschema1.xml
similarity index 100%
rename from trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testschema1.xml
rename to java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testschema1.xml
diff --git a/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testschema1bad.xml b/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testschema1bad.xml
similarity index 100%
rename from trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testschema1bad.xml
rename to java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testschema1bad.xml
diff --git a/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/activity1.xml b/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/activity1.xml
similarity index 100%
rename from trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/activity1.xml
rename to java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/activity1.xml
diff --git a/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/appdata1.xml b/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/appdata1.xml
similarity index 100%
rename from trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/appdata1.xml
rename to java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/appdata1.xml
diff --git a/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/group1.xml b/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/group1.xml
similarity index 100%
rename from trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/group1.xml
rename to java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/group1.xml
diff --git a/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/person1.xml b/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/person1.xml
similarity index 100%
rename from trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/person1.xml
rename to java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/person1.xml
diff --git a/trunk/java/social-api/src/test/resources/simplelog.properties b/java/social-api/src/test/resources/simplelog.properties
similarity index 100%
rename from trunk/java/social-api/src/test/resources/simplelog.properties
rename to java/social-api/src/test/resources/simplelog.properties
diff --git a/trunk/java/uber/pom.xml b/java/uber/pom.xml
similarity index 100%
rename from trunk/java/uber/pom.xml
rename to java/uber/pom.xml
diff --git a/trunk/java/uber/src/main/appended-resources/META-INF/LICENSE b/java/uber/src/main/appended-resources/META-INF/LICENSE
similarity index 100%
rename from trunk/java/uber/src/main/appended-resources/META-INF/LICENSE
rename to java/uber/src/main/appended-resources/META-INF/LICENSE
diff --git a/trunk/java/uber/src/main/appended-resources/META-INF/NOTICE b/java/uber/src/main/appended-resources/META-INF/NOTICE
similarity index 100%
rename from trunk/java/uber/src/main/appended-resources/META-INF/NOTICE
rename to java/uber/src/main/appended-resources/META-INF/NOTICE
diff --git a/trunk/php/.htaccess b/php/.htaccess
similarity index 100%
rename from trunk/php/.htaccess
rename to php/.htaccess
diff --git a/trunk/php/LICENSE b/php/LICENSE
similarity index 100%
rename from trunk/php/LICENSE
rename to php/LICENSE
diff --git a/trunk/php/NOTICE b/php/NOTICE
similarity index 100%
rename from trunk/php/NOTICE
rename to php/NOTICE
diff --git a/trunk/php/README b/php/README
similarity index 100%
rename from trunk/php/README
rename to php/README
diff --git a/trunk/php/build.xml b/php/build.xml
similarity index 100%
rename from trunk/php/build.xml
rename to php/build.xml
diff --git a/trunk/php/certs/README b/php/certs/README
similarity index 100%
rename from trunk/php/certs/README
rename to php/certs/README
diff --git a/trunk/php/config/container.php b/php/config/container.php
similarity index 100%
rename from trunk/php/config/container.php
rename to php/config/container.php
diff --git a/trunk/php/config/test.php b/php/config/test.php
similarity index 100%
rename from trunk/php/config/test.php
rename to php/config/test.php
diff --git a/trunk/php/docs/README.lighttpd b/php/docs/README.lighttpd
similarity index 100%
rename from trunk/php/docs/README.lighttpd
rename to php/docs/README.lighttpd
diff --git a/trunk/php/docs/README.svn.txt b/php/docs/README.svn.txt
similarity index 100%
rename from trunk/php/docs/README.svn.txt
rename to php/docs/README.svn.txt
diff --git a/trunk/php/docs/style-conventions.xml b/php/docs/style-conventions.xml
similarity index 100%
rename from trunk/php/docs/style-conventions.xml
rename to php/docs/style-conventions.xml
diff --git a/trunk/php/docs/style-guide.html b/php/docs/style-guide.html
similarity index 100%
rename from trunk/php/docs/style-guide.html
rename to php/docs/style-guide.html
diff --git a/trunk/php/external/OAuth/OAuth.php b/php/external/OAuth/OAuth.php
similarity index 100%
rename from trunk/php/external/OAuth/OAuth.php
rename to php/external/OAuth/OAuth.php
diff --git a/trunk/php/external/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php b/php/external/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
similarity index 100%
rename from trunk/php/external/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
rename to php/external/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
diff --git a/trunk/php/external/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/php/external/Symfony/Component/ClassLoader/ClassCollectionLoader.php
similarity index 100%
rename from trunk/php/external/Symfony/Component/ClassLoader/ClassCollectionLoader.php
rename to php/external/Symfony/Component/ClassLoader/ClassCollectionLoader.php
diff --git a/trunk/php/external/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php b/php/external/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
similarity index 100%
rename from trunk/php/external/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
rename to php/external/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
diff --git a/trunk/php/external/Symfony/Component/ClassLoader/LICENSE b/php/external/Symfony/Component/ClassLoader/LICENSE
similarity index 100%
rename from trunk/php/external/Symfony/Component/ClassLoader/LICENSE
rename to php/external/Symfony/Component/ClassLoader/LICENSE
diff --git a/trunk/php/external/Symfony/Component/ClassLoader/MapClassLoader.php b/php/external/Symfony/Component/ClassLoader/MapClassLoader.php
similarity index 100%
rename from trunk/php/external/Symfony/Component/ClassLoader/MapClassLoader.php
rename to php/external/Symfony/Component/ClassLoader/MapClassLoader.php
diff --git a/trunk/php/external/Symfony/Component/ClassLoader/UniversalClassLoader.php b/php/external/Symfony/Component/ClassLoader/UniversalClassLoader.php
similarity index 100%
rename from trunk/php/external/Symfony/Component/ClassLoader/UniversalClassLoader.php
rename to php/external/Symfony/Component/ClassLoader/UniversalClassLoader.php
diff --git a/trunk/php/external/Zend/Exception.php b/php/external/Zend/Exception.php
similarity index 100%
rename from trunk/php/external/Zend/Exception.php
rename to php/external/Zend/Exception.php
diff --git a/trunk/php/external/Zend/Feed.php b/php/external/Zend/Feed.php
similarity index 100%
rename from trunk/php/external/Zend/Feed.php
rename to php/external/Zend/Feed.php
diff --git a/trunk/php/external/Zend/Feed/Abstract.php b/php/external/Zend/Feed/Abstract.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Abstract.php
rename to php/external/Zend/Feed/Abstract.php
diff --git a/trunk/php/external/Zend/Feed/Atom.php b/php/external/Zend/Feed/Atom.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Atom.php
rename to php/external/Zend/Feed/Atom.php
diff --git a/trunk/php/external/Zend/Feed/Builder.php b/php/external/Zend/Feed/Builder.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Builder.php
rename to php/external/Zend/Feed/Builder.php
diff --git a/trunk/php/external/Zend/Feed/Builder/Entry.php b/php/external/Zend/Feed/Builder/Entry.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Builder/Entry.php
rename to php/external/Zend/Feed/Builder/Entry.php
diff --git a/trunk/php/external/Zend/Feed/Builder/Exception.php b/php/external/Zend/Feed/Builder/Exception.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Builder/Exception.php
rename to php/external/Zend/Feed/Builder/Exception.php
diff --git a/trunk/php/external/Zend/Feed/Builder/Header.php b/php/external/Zend/Feed/Builder/Header.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Builder/Header.php
rename to php/external/Zend/Feed/Builder/Header.php
diff --git a/trunk/php/external/Zend/Feed/Builder/Header/Itunes.php b/php/external/Zend/Feed/Builder/Header/Itunes.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Builder/Header/Itunes.php
rename to php/external/Zend/Feed/Builder/Header/Itunes.php
diff --git a/trunk/php/external/Zend/Feed/Builder/Interface.php b/php/external/Zend/Feed/Builder/Interface.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Builder/Interface.php
rename to php/external/Zend/Feed/Builder/Interface.php
diff --git a/trunk/php/external/Zend/Feed/Element.php b/php/external/Zend/Feed/Element.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Element.php
rename to php/external/Zend/Feed/Element.php
diff --git a/trunk/php/external/Zend/Feed/Entry/Abstract.php b/php/external/Zend/Feed/Entry/Abstract.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Entry/Abstract.php
rename to php/external/Zend/Feed/Entry/Abstract.php
diff --git a/trunk/php/external/Zend/Feed/Entry/Atom.php b/php/external/Zend/Feed/Entry/Atom.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Entry/Atom.php
rename to php/external/Zend/Feed/Entry/Atom.php
diff --git a/trunk/php/external/Zend/Feed/Entry/Rss.php b/php/external/Zend/Feed/Entry/Rss.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Entry/Rss.php
rename to php/external/Zend/Feed/Entry/Rss.php
diff --git a/trunk/php/external/Zend/Feed/Exception.php b/php/external/Zend/Feed/Exception.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Exception.php
rename to php/external/Zend/Feed/Exception.php
diff --git a/trunk/php/external/Zend/Feed/Rss.php b/php/external/Zend/Feed/Rss.php
similarity index 100%
rename from trunk/php/external/Zend/Feed/Rss.php
rename to php/external/Zend/Feed/Rss.php
diff --git a/trunk/php/external/Zend/Http/Client.php b/php/external/Zend/Http/Client.php
similarity index 100%
rename from trunk/php/external/Zend/Http/Client.php
rename to php/external/Zend/Http/Client.php
diff --git a/trunk/php/external/Zend/Http/Client/Adapter/Exception.php b/php/external/Zend/Http/Client/Adapter/Exception.php
similarity index 100%
rename from trunk/php/external/Zend/Http/Client/Adapter/Exception.php
rename to php/external/Zend/Http/Client/Adapter/Exception.php
diff --git a/trunk/php/external/Zend/Http/Client/Adapter/Interface.php b/php/external/Zend/Http/Client/Adapter/Interface.php
similarity index 100%
rename from trunk/php/external/Zend/Http/Client/Adapter/Interface.php
rename to php/external/Zend/Http/Client/Adapter/Interface.php
diff --git a/trunk/php/external/Zend/Http/Client/Adapter/Proxy.php b/php/external/Zend/Http/Client/Adapter/Proxy.php
similarity index 100%
rename from trunk/php/external/Zend/Http/Client/Adapter/Proxy.php
rename to php/external/Zend/Http/Client/Adapter/Proxy.php
diff --git a/trunk/php/external/Zend/Http/Client/Adapter/Socket.php b/php/external/Zend/Http/Client/Adapter/Socket.php
similarity index 100%
rename from trunk/php/external/Zend/Http/Client/Adapter/Socket.php
rename to php/external/Zend/Http/Client/Adapter/Socket.php
diff --git a/trunk/php/external/Zend/Http/Client/Adapter/Test.php b/php/external/Zend/Http/Client/Adapter/Test.php
similarity index 100%
rename from trunk/php/external/Zend/Http/Client/Adapter/Test.php
rename to php/external/Zend/Http/Client/Adapter/Test.php
diff --git a/trunk/php/external/Zend/Http/Client/Exception.php b/php/external/Zend/Http/Client/Exception.php
similarity index 100%
rename from trunk/php/external/Zend/Http/Client/Exception.php
rename to php/external/Zend/Http/Client/Exception.php
diff --git a/trunk/php/external/Zend/Http/Cookie.php b/php/external/Zend/Http/Cookie.php
similarity index 100%
rename from trunk/php/external/Zend/Http/Cookie.php
rename to php/external/Zend/Http/Cookie.php
diff --git a/trunk/php/external/Zend/Http/CookieJar.php b/php/external/Zend/Http/CookieJar.php
similarity index 100%
rename from trunk/php/external/Zend/Http/CookieJar.php
rename to php/external/Zend/Http/CookieJar.php
diff --git a/trunk/php/external/Zend/Http/Exception.php b/php/external/Zend/Http/Exception.php
similarity index 100%
rename from trunk/php/external/Zend/Http/Exception.php
rename to php/external/Zend/Http/Exception.php
diff --git a/trunk/php/external/Zend/Http/Response.php b/php/external/Zend/Http/Response.php
similarity index 100%
rename from trunk/php/external/Zend/Http/Response.php
rename to php/external/Zend/Http/Response.php
diff --git a/trunk/php/external/Zend/Loader.php b/php/external/Zend/Loader.php
similarity index 100%
rename from trunk/php/external/Zend/Loader.php
rename to php/external/Zend/Loader.php
diff --git a/trunk/php/external/Zend/Loader/Exception.php b/php/external/Zend/Loader/Exception.php
similarity index 100%
rename from trunk/php/external/Zend/Loader/Exception.php
rename to php/external/Zend/Loader/Exception.php
diff --git a/trunk/php/external/Zend/Loader/PluginLoader.php b/php/external/Zend/Loader/PluginLoader.php
similarity index 100%
rename from trunk/php/external/Zend/Loader/PluginLoader.php
rename to php/external/Zend/Loader/PluginLoader.php
diff --git a/trunk/php/external/Zend/Loader/PluginLoader/Exception.php b/php/external/Zend/Loader/PluginLoader/Exception.php
similarity index 100%
rename from trunk/php/external/Zend/Loader/PluginLoader/Exception.php
rename to php/external/Zend/Loader/PluginLoader/Exception.php
diff --git a/trunk/php/external/Zend/Loader/PluginLoader/Interface.php b/php/external/Zend/Loader/PluginLoader/Interface.php
similarity index 100%
rename from trunk/php/external/Zend/Loader/PluginLoader/Interface.php
rename to php/external/Zend/Loader/PluginLoader/Interface.php
diff --git a/trunk/php/external/Zend/README b/php/external/Zend/README
similarity index 100%
rename from trunk/php/external/Zend/README
rename to php/external/Zend/README
diff --git a/trunk/php/external/Zend/Registry.php b/php/external/Zend/Registry.php
similarity index 100%
rename from trunk/php/external/Zend/Registry.php
rename to php/external/Zend/Registry.php
diff --git a/trunk/php/external/Zend/Uri.php b/php/external/Zend/Uri.php
similarity index 100%
rename from trunk/php/external/Zend/Uri.php
rename to php/external/Zend/Uri.php
diff --git a/trunk/php/external/Zend/Uri/Exception.php b/php/external/Zend/Uri/Exception.php
similarity index 100%
rename from trunk/php/external/Zend/Uri/Exception.php
rename to php/external/Zend/Uri/Exception.php
diff --git a/trunk/php/external/Zend/Uri/Http.php b/php/external/Zend/Uri/Http.php
similarity index 100%
rename from trunk/php/external/Zend/Uri/Http.php
rename to php/external/Zend/Uri/Http.php
diff --git a/trunk/php/external/Zend/Validate.php b/php/external/Zend/Validate.php
similarity index 100%
rename from trunk/php/external/Zend/Validate.php
rename to php/external/Zend/Validate.php
diff --git a/trunk/php/external/Zend/Validate/Abstract.php b/php/external/Zend/Validate/Abstract.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Abstract.php
rename to php/external/Zend/Validate/Abstract.php
diff --git a/trunk/php/external/Zend/Validate/Alnum.php b/php/external/Zend/Validate/Alnum.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Alnum.php
rename to php/external/Zend/Validate/Alnum.php
diff --git a/trunk/php/external/Zend/Validate/Alpha.php b/php/external/Zend/Validate/Alpha.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Alpha.php
rename to php/external/Zend/Validate/Alpha.php
diff --git a/trunk/php/external/Zend/Validate/Barcode.php b/php/external/Zend/Validate/Barcode.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Barcode.php
rename to php/external/Zend/Validate/Barcode.php
diff --git a/trunk/php/external/Zend/Validate/Barcode/Ean13.php b/php/external/Zend/Validate/Barcode/Ean13.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Barcode/Ean13.php
rename to php/external/Zend/Validate/Barcode/Ean13.php
diff --git a/trunk/php/external/Zend/Validate/Barcode/UpcA.php b/php/external/Zend/Validate/Barcode/UpcA.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Barcode/UpcA.php
rename to php/external/Zend/Validate/Barcode/UpcA.php
diff --git a/trunk/php/external/Zend/Validate/Between.php b/php/external/Zend/Validate/Between.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Between.php
rename to php/external/Zend/Validate/Between.php
diff --git a/trunk/php/external/Zend/Validate/Ccnum.php b/php/external/Zend/Validate/Ccnum.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Ccnum.php
rename to php/external/Zend/Validate/Ccnum.php
diff --git a/trunk/php/external/Zend/Validate/Date.php b/php/external/Zend/Validate/Date.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Date.php
rename to php/external/Zend/Validate/Date.php
diff --git a/trunk/php/external/Zend/Validate/Digits.php b/php/external/Zend/Validate/Digits.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Digits.php
rename to php/external/Zend/Validate/Digits.php
diff --git a/trunk/php/external/Zend/Validate/EmailAddress.php b/php/external/Zend/Validate/EmailAddress.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/EmailAddress.php
rename to php/external/Zend/Validate/EmailAddress.php
diff --git a/trunk/php/external/Zend/Validate/Exception.php b/php/external/Zend/Validate/Exception.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Exception.php
rename to php/external/Zend/Validate/Exception.php
diff --git a/trunk/php/external/Zend/Validate/Float.php b/php/external/Zend/Validate/Float.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Float.php
rename to php/external/Zend/Validate/Float.php
diff --git a/trunk/php/external/Zend/Validate/GreaterThan.php b/php/external/Zend/Validate/GreaterThan.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/GreaterThan.php
rename to php/external/Zend/Validate/GreaterThan.php
diff --git a/trunk/php/external/Zend/Validate/Hex.php b/php/external/Zend/Validate/Hex.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Hex.php
rename to php/external/Zend/Validate/Hex.php
diff --git a/trunk/php/external/Zend/Validate/Hostname.php b/php/external/Zend/Validate/Hostname.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Hostname.php
rename to php/external/Zend/Validate/Hostname.php
diff --git a/trunk/php/external/Zend/Validate/Hostname/At.php b/php/external/Zend/Validate/Hostname/At.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Hostname/At.php
rename to php/external/Zend/Validate/Hostname/At.php
diff --git a/trunk/php/external/Zend/Validate/Hostname/Ch.php b/php/external/Zend/Validate/Hostname/Ch.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Hostname/Ch.php
rename to php/external/Zend/Validate/Hostname/Ch.php
diff --git a/trunk/php/external/Zend/Validate/Hostname/De.php b/php/external/Zend/Validate/Hostname/De.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Hostname/De.php
rename to php/external/Zend/Validate/Hostname/De.php
diff --git a/trunk/php/external/Zend/Validate/Hostname/Fi.php b/php/external/Zend/Validate/Hostname/Fi.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Hostname/Fi.php
rename to php/external/Zend/Validate/Hostname/Fi.php
diff --git a/trunk/php/external/Zend/Validate/Hostname/Hu.php b/php/external/Zend/Validate/Hostname/Hu.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Hostname/Hu.php
rename to php/external/Zend/Validate/Hostname/Hu.php
diff --git a/trunk/php/external/Zend/Validate/Hostname/Interface.php b/php/external/Zend/Validate/Hostname/Interface.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Hostname/Interface.php
rename to php/external/Zend/Validate/Hostname/Interface.php
diff --git a/trunk/php/external/Zend/Validate/Hostname/Li.php b/php/external/Zend/Validate/Hostname/Li.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Hostname/Li.php
rename to php/external/Zend/Validate/Hostname/Li.php
diff --git a/trunk/php/external/Zend/Validate/Hostname/No.php b/php/external/Zend/Validate/Hostname/No.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Hostname/No.php
rename to php/external/Zend/Validate/Hostname/No.php
diff --git a/trunk/php/external/Zend/Validate/Hostname/Se.php b/php/external/Zend/Validate/Hostname/Se.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Hostname/Se.php
rename to php/external/Zend/Validate/Hostname/Se.php
diff --git a/trunk/php/external/Zend/Validate/Identical.php b/php/external/Zend/Validate/Identical.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Identical.php
rename to php/external/Zend/Validate/Identical.php
diff --git a/trunk/php/external/Zend/Validate/InArray.php b/php/external/Zend/Validate/InArray.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/InArray.php
rename to php/external/Zend/Validate/InArray.php
diff --git a/trunk/php/external/Zend/Validate/Int.php b/php/external/Zend/Validate/Int.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Int.php
rename to php/external/Zend/Validate/Int.php
diff --git a/trunk/php/external/Zend/Validate/Interface.php b/php/external/Zend/Validate/Interface.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Interface.php
rename to php/external/Zend/Validate/Interface.php
diff --git a/trunk/php/external/Zend/Validate/Ip.php b/php/external/Zend/Validate/Ip.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Ip.php
rename to php/external/Zend/Validate/Ip.php
diff --git a/trunk/php/external/Zend/Validate/LessThan.php b/php/external/Zend/Validate/LessThan.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/LessThan.php
rename to php/external/Zend/Validate/LessThan.php
diff --git a/trunk/php/external/Zend/Validate/NotEmpty.php b/php/external/Zend/Validate/NotEmpty.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/NotEmpty.php
rename to php/external/Zend/Validate/NotEmpty.php
diff --git a/trunk/php/external/Zend/Validate/Regex.php b/php/external/Zend/Validate/Regex.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/Regex.php
rename to php/external/Zend/Validate/Regex.php
diff --git a/trunk/php/external/Zend/Validate/StringLength.php b/php/external/Zend/Validate/StringLength.php
similarity index 100%
rename from trunk/php/external/Zend/Validate/StringLength.php
rename to php/external/Zend/Validate/StringLength.php
diff --git a/trunk/php/external/dbunit.bat b/php/external/dbunit.bat
similarity index 100%
rename from trunk/php/external/dbunit.bat
rename to php/external/dbunit.bat
diff --git a/trunk/php/external/dbunit.php b/php/external/dbunit.php
similarity index 100%
rename from trunk/php/external/dbunit.php
rename to php/external/dbunit.php
diff --git a/trunk/php/external/jsmin-php/jsmin.php b/php/external/jsmin-php/jsmin.php
similarity index 100%
rename from trunk/php/external/jsmin-php/jsmin.php
rename to php/external/jsmin-php/jsmin.php
diff --git a/trunk/php/external/resources/com/google/caja/plugin/domita-minified.js b/php/external/resources/com/google/caja/plugin/domita-minified.js
similarity index 100%
rename from trunk/php/external/resources/com/google/caja/plugin/domita-minified.js
rename to php/external/resources/com/google/caja/plugin/domita-minified.js
diff --git a/trunk/php/external/resources/com/google/caja/plugin/html-sanitizer-minified.js b/php/external/resources/com/google/caja/plugin/html-sanitizer-minified.js
similarity index 100%
rename from trunk/php/external/resources/com/google/caja/plugin/html-sanitizer-minified.js
rename to php/external/resources/com/google/caja/plugin/html-sanitizer-minified.js
diff --git a/trunk/php/external/resources/com/google/caja/plugin/valija.out.js b/php/external/resources/com/google/caja/plugin/valija.out.js
similarity index 100%
rename from trunk/php/external/resources/com/google/caja/plugin/valija.out.js
rename to php/external/resources/com/google/caja/plugin/valija.out.js
diff --git a/trunk/php/index.php b/php/index.php
similarity index 100%
rename from trunk/php/index.php
rename to php/index.php
diff --git a/trunk/php/phpunit.xml.dist b/php/phpunit.xml.dist
similarity index 100%
rename from trunk/php/phpunit.xml.dist
rename to php/phpunit.xml.dist
diff --git a/trunk/php/pom.xml b/php/pom.xml
similarity index 100%
rename from trunk/php/pom.xml
rename to php/pom.xml
diff --git a/trunk/php/src/apache/shindig/FrontController.php b/php/src/apache/shindig/FrontController.php
similarity index 100%
rename from trunk/php/src/apache/shindig/FrontController.php
rename to php/src/apache/shindig/FrontController.php
diff --git a/trunk/php/src/apache/shindig/bootstrap.php b/php/src/apache/shindig/bootstrap.php
similarity index 100%
rename from trunk/php/src/apache/shindig/bootstrap.php
rename to php/src/apache/shindig/bootstrap.php
diff --git a/trunk/php/src/apache/shindig/common/AuthenticationMode.php b/php/src/apache/shindig/common/AuthenticationMode.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/AuthenticationMode.php
rename to php/src/apache/shindig/common/AuthenticationMode.php
diff --git a/trunk/php/src/apache/shindig/common/BlobCrypter.php b/php/src/apache/shindig/common/BlobCrypter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/BlobCrypter.php
rename to php/src/apache/shindig/common/BlobCrypter.php
diff --git a/trunk/php/src/apache/shindig/common/BlobCrypterException.php b/php/src/apache/shindig/common/BlobCrypterException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/BlobCrypterException.php
rename to php/src/apache/shindig/common/BlobCrypterException.php
diff --git a/trunk/php/src/apache/shindig/common/Cache.php b/php/src/apache/shindig/common/Cache.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/Cache.php
rename to php/src/apache/shindig/common/Cache.php
diff --git a/trunk/php/src/apache/shindig/common/CacheException.php b/php/src/apache/shindig/common/CacheException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/CacheException.php
rename to php/src/apache/shindig/common/CacheException.php
diff --git a/trunk/php/src/apache/shindig/common/CacheStorage.php b/php/src/apache/shindig/common/CacheStorage.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/CacheStorage.php
rename to php/src/apache/shindig/common/CacheStorage.php
diff --git a/trunk/php/src/apache/shindig/common/Config.php b/php/src/apache/shindig/common/Config.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/Config.php
rename to php/src/apache/shindig/common/Config.php
diff --git a/trunk/php/src/apache/shindig/common/ConfigException.php b/php/src/apache/shindig/common/ConfigException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/ConfigException.php
rename to php/src/apache/shindig/common/ConfigException.php
diff --git a/trunk/php/src/apache/shindig/common/File.php b/php/src/apache/shindig/common/File.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/File.php
rename to php/src/apache/shindig/common/File.php
diff --git a/trunk/php/src/apache/shindig/common/HttpServlet.php b/php/src/apache/shindig/common/HttpServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/HttpServlet.php
rename to php/src/apache/shindig/common/HttpServlet.php
diff --git a/trunk/php/src/apache/shindig/common/IllegalArgumentException.php b/php/src/apache/shindig/common/IllegalArgumentException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/IllegalArgumentException.php
rename to php/src/apache/shindig/common/IllegalArgumentException.php
diff --git a/trunk/php/src/apache/shindig/common/Locale.php b/php/src/apache/shindig/common/Locale.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/Locale.php
rename to php/src/apache/shindig/common/Locale.php
diff --git a/trunk/php/src/apache/shindig/common/OAuthLookupService.php b/php/src/apache/shindig/common/OAuthLookupService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/OAuthLookupService.php
rename to php/src/apache/shindig/common/OAuthLookupService.php
diff --git a/trunk/php/src/apache/shindig/common/OpenSocialVersion.php b/php/src/apache/shindig/common/OpenSocialVersion.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/OpenSocialVersion.php
rename to php/src/apache/shindig/common/OpenSocialVersion.php
diff --git a/trunk/php/src/apache/shindig/common/Options.php b/php/src/apache/shindig/common/Options.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/Options.php
rename to php/src/apache/shindig/common/Options.php
diff --git a/trunk/php/src/apache/shindig/common/RemoteContent.php b/php/src/apache/shindig/common/RemoteContent.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/RemoteContent.php
rename to php/src/apache/shindig/common/RemoteContent.php
diff --git a/trunk/php/src/apache/shindig/common/RemoteContentException.php b/php/src/apache/shindig/common/RemoteContentException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/RemoteContentException.php
rename to php/src/apache/shindig/common/RemoteContentException.php
diff --git a/trunk/php/src/apache/shindig/common/RemoteContentFetcher.php b/php/src/apache/shindig/common/RemoteContentFetcher.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/RemoteContentFetcher.php
rename to php/src/apache/shindig/common/RemoteContentFetcher.php
diff --git a/trunk/php/src/apache/shindig/common/RemoteContentRequest.php b/php/src/apache/shindig/common/RemoteContentRequest.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/RemoteContentRequest.php
rename to php/src/apache/shindig/common/RemoteContentRequest.php
diff --git a/trunk/php/src/apache/shindig/common/RequestTime.php b/php/src/apache/shindig/common/RequestTime.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/RequestTime.php
rename to php/src/apache/shindig/common/RequestTime.php
diff --git a/trunk/php/src/apache/shindig/common/SecurityToken.php b/php/src/apache/shindig/common/SecurityToken.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/SecurityToken.php
rename to php/src/apache/shindig/common/SecurityToken.php
diff --git a/trunk/php/src/apache/shindig/common/SecurityTokenDecoder.php b/php/src/apache/shindig/common/SecurityTokenDecoder.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/SecurityTokenDecoder.php
rename to php/src/apache/shindig/common/SecurityTokenDecoder.php
diff --git a/trunk/php/src/apache/shindig/common/ShindigOAuth.php b/php/src/apache/shindig/common/ShindigOAuth.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/ShindigOAuth.php
rename to php/src/apache/shindig/common/ShindigOAuth.php
diff --git a/trunk/php/src/apache/shindig/common/ShindigOAuthNoDataException.php b/php/src/apache/shindig/common/ShindigOAuthNoDataException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/ShindigOAuthNoDataException.php
rename to php/src/apache/shindig/common/ShindigOAuthNoDataException.php
diff --git a/trunk/php/src/apache/shindig/common/ShindigOAuthProblemException.php b/php/src/apache/shindig/common/ShindigOAuthProblemException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/ShindigOAuthProblemException.php
rename to php/src/apache/shindig/common/ShindigOAuthProblemException.php
diff --git a/trunk/php/src/apache/shindig/common/ShindigOAuthProtocolException.php b/php/src/apache/shindig/common/ShindigOAuthProtocolException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/ShindigOAuthProtocolException.php
rename to php/src/apache/shindig/common/ShindigOAuthProtocolException.php
diff --git a/trunk/php/src/apache/shindig/common/ShindigOAuthRequest.php b/php/src/apache/shindig/common/ShindigOAuthRequest.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/ShindigOAuthRequest.php
rename to php/src/apache/shindig/common/ShindigOAuthRequest.php
diff --git a/trunk/php/src/apache/shindig/common/ShindigOAuthUtil.php b/php/src/apache/shindig/common/ShindigOAuthUtil.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/ShindigOAuthUtil.php
rename to php/src/apache/shindig/common/ShindigOAuthUtil.php
diff --git a/trunk/php/src/apache/shindig/common/ShindigRsaSha1SignatureMethod.php b/php/src/apache/shindig/common/ShindigRsaSha1SignatureMethod.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/ShindigRsaSha1SignatureMethod.php
rename to php/src/apache/shindig/common/ShindigRsaSha1SignatureMethod.php
diff --git a/trunk/php/src/apache/shindig/common/XmlError.php b/php/src/apache/shindig/common/XmlError.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/XmlError.php
rename to php/src/apache/shindig/common/XmlError.php
diff --git a/trunk/php/src/apache/shindig/common/sample/BasicBlobCrypter.php b/php/src/apache/shindig/common/sample/BasicBlobCrypter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/BasicBlobCrypter.php
rename to php/src/apache/shindig/common/sample/BasicBlobCrypter.php
diff --git a/trunk/php/src/apache/shindig/common/sample/BasicOAuthDataStore.php b/php/src/apache/shindig/common/sample/BasicOAuthDataStore.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/BasicOAuthDataStore.php
rename to php/src/apache/shindig/common/sample/BasicOAuthDataStore.php
diff --git a/trunk/php/src/apache/shindig/common/sample/BasicOAuthLookupService.php b/php/src/apache/shindig/common/sample/BasicOAuthLookupService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/BasicOAuthLookupService.php
rename to php/src/apache/shindig/common/sample/BasicOAuthLookupService.php
diff --git a/trunk/php/src/apache/shindig/common/sample/BasicRemoteContent.php b/php/src/apache/shindig/common/sample/BasicRemoteContent.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/BasicRemoteContent.php
rename to php/src/apache/shindig/common/sample/BasicRemoteContent.php
diff --git a/trunk/php/src/apache/shindig/common/sample/BasicRemoteContentFetcher.php b/php/src/apache/shindig/common/sample/BasicRemoteContentFetcher.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/BasicRemoteContentFetcher.php
rename to php/src/apache/shindig/common/sample/BasicRemoteContentFetcher.php
diff --git a/trunk/php/src/apache/shindig/common/sample/BasicSecurityToken.php b/php/src/apache/shindig/common/sample/BasicSecurityToken.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/BasicSecurityToken.php
rename to php/src/apache/shindig/common/sample/BasicSecurityToken.php
diff --git a/trunk/php/src/apache/shindig/common/sample/BasicSecurityTokenDecoder.php b/php/src/apache/shindig/common/sample/BasicSecurityTokenDecoder.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/BasicSecurityTokenDecoder.php
rename to php/src/apache/shindig/common/sample/BasicSecurityTokenDecoder.php
diff --git a/trunk/php/src/apache/shindig/common/sample/BasicSecurityTokenException.php b/php/src/apache/shindig/common/sample/BasicSecurityTokenException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/BasicSecurityTokenException.php
rename to php/src/apache/shindig/common/sample/BasicSecurityTokenException.php
diff --git a/trunk/php/src/apache/shindig/common/sample/BlobExpiredException.php b/php/src/apache/shindig/common/sample/BlobExpiredException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/BlobExpiredException.php
rename to php/src/apache/shindig/common/sample/BlobExpiredException.php
diff --git a/trunk/php/src/apache/shindig/common/sample/CacheStorageApc.php b/php/src/apache/shindig/common/sample/CacheStorageApc.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/CacheStorageApc.php
rename to php/src/apache/shindig/common/sample/CacheStorageApc.php
diff --git a/trunk/php/src/apache/shindig/common/sample/CacheStorageFile.php b/php/src/apache/shindig/common/sample/CacheStorageFile.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/CacheStorageFile.php
rename to php/src/apache/shindig/common/sample/CacheStorageFile.php
diff --git a/trunk/php/src/apache/shindig/common/sample/CacheStorageMemcache.php b/php/src/apache/shindig/common/sample/CacheStorageMemcache.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/CacheStorageMemcache.php
rename to php/src/apache/shindig/common/sample/CacheStorageMemcache.php
diff --git a/trunk/php/src/apache/shindig/common/sample/Crypto.php b/php/src/apache/shindig/common/sample/Crypto.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/Crypto.php
rename to php/src/apache/shindig/common/sample/Crypto.php
diff --git a/trunk/php/src/apache/shindig/common/sample/GeneralSecurityException.php b/php/src/apache/shindig/common/sample/GeneralSecurityException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/common/sample/GeneralSecurityException.php
rename to php/src/apache/shindig/common/sample/GeneralSecurityException.php
diff --git a/trunk/php/src/apache/shindig/gadgets/ContainerConfig.php b/php/src/apache/shindig/gadgets/ContainerConfig.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/ContainerConfig.php
rename to php/src/apache/shindig/gadgets/ContainerConfig.php
diff --git a/trunk/php/src/apache/shindig/gadgets/Gadget.php b/php/src/apache/shindig/gadgets/Gadget.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/Gadget.php
rename to php/src/apache/shindig/gadgets/Gadget.php
diff --git a/trunk/php/src/apache/shindig/gadgets/GadgetBlacklist.php b/php/src/apache/shindig/gadgets/GadgetBlacklist.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/GadgetBlacklist.php
rename to php/src/apache/shindig/gadgets/GadgetBlacklist.php
diff --git a/trunk/php/src/apache/shindig/gadgets/GadgetContext.php b/php/src/apache/shindig/gadgets/GadgetContext.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/GadgetContext.php
rename to php/src/apache/shindig/gadgets/GadgetContext.php
diff --git a/trunk/php/src/apache/shindig/gadgets/GadgetException.php b/php/src/apache/shindig/gadgets/GadgetException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/GadgetException.php
rename to php/src/apache/shindig/gadgets/GadgetException.php
diff --git a/trunk/php/src/apache/shindig/gadgets/GadgetFactory.php b/php/src/apache/shindig/gadgets/GadgetFactory.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/GadgetFactory.php
rename to php/src/apache/shindig/gadgets/GadgetFactory.php
diff --git a/trunk/php/src/apache/shindig/gadgets/GadgetFeatureRegistry.php b/php/src/apache/shindig/gadgets/GadgetFeatureRegistry.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/GadgetFeatureRegistry.php
rename to php/src/apache/shindig/gadgets/GadgetFeatureRegistry.php
diff --git a/trunk/php/src/apache/shindig/gadgets/GadgetSpec.php b/php/src/apache/shindig/gadgets/GadgetSpec.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/GadgetSpec.php
rename to php/src/apache/shindig/gadgets/GadgetSpec.php
diff --git a/trunk/php/src/apache/shindig/gadgets/GadgetSpecException.php b/php/src/apache/shindig/gadgets/GadgetSpecException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/GadgetSpecException.php
rename to php/src/apache/shindig/gadgets/GadgetSpecException.php
diff --git a/trunk/php/src/apache/shindig/gadgets/GadgetSpecParser.php b/php/src/apache/shindig/gadgets/GadgetSpecParser.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/GadgetSpecParser.php
rename to php/src/apache/shindig/gadgets/GadgetSpecParser.php
diff --git a/trunk/php/src/apache/shindig/gadgets/MakeRequest.php b/php/src/apache/shindig/gadgets/MakeRequest.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/MakeRequest.php
rename to php/src/apache/shindig/gadgets/MakeRequest.php
diff --git a/trunk/php/src/apache/shindig/gadgets/MakeRequestHandler.php b/php/src/apache/shindig/gadgets/MakeRequestHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/MakeRequestHandler.php
rename to php/src/apache/shindig/gadgets/MakeRequestHandler.php
diff --git a/trunk/php/src/apache/shindig/gadgets/MakeRequestOptions.php b/php/src/apache/shindig/gadgets/MakeRequestOptions.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/MakeRequestOptions.php
rename to php/src/apache/shindig/gadgets/MakeRequestOptions.php
diff --git a/trunk/php/src/apache/shindig/gadgets/MakeRequestParameterException.php b/php/src/apache/shindig/gadgets/MakeRequestParameterException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/MakeRequestParameterException.php
rename to php/src/apache/shindig/gadgets/MakeRequestParameterException.php
diff --git a/trunk/php/src/apache/shindig/gadgets/MetadataGadgetContext.php b/php/src/apache/shindig/gadgets/MetadataGadgetContext.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/MetadataGadgetContext.php
rename to php/src/apache/shindig/gadgets/MetadataGadgetContext.php
diff --git a/trunk/php/src/apache/shindig/gadgets/MetadataHandler.php b/php/src/apache/shindig/gadgets/MetadataHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/MetadataHandler.php
rename to php/src/apache/shindig/gadgets/MetadataHandler.php
diff --git a/trunk/php/src/apache/shindig/gadgets/ProxyBase.php b/php/src/apache/shindig/gadgets/ProxyBase.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/ProxyBase.php
rename to php/src/apache/shindig/gadgets/ProxyBase.php
diff --git a/trunk/php/src/apache/shindig/gadgets/ProxyHandler.php b/php/src/apache/shindig/gadgets/ProxyHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/ProxyHandler.php
rename to php/src/apache/shindig/gadgets/ProxyHandler.php
diff --git a/trunk/php/src/apache/shindig/gadgets/SigningFetcher.php b/php/src/apache/shindig/gadgets/SigningFetcher.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/SigningFetcher.php
rename to php/src/apache/shindig/gadgets/SigningFetcher.php
diff --git a/trunk/php/src/apache/shindig/gadgets/SigningFetcherFactory.php b/php/src/apache/shindig/gadgets/SigningFetcherFactory.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/SigningFetcherFactory.php
rename to php/src/apache/shindig/gadgets/SigningFetcherFactory.php
diff --git a/trunk/php/src/apache/shindig/gadgets/Substitutions.php b/php/src/apache/shindig/gadgets/Substitutions.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/Substitutions.php
rename to php/src/apache/shindig/gadgets/Substitutions.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/AccesorInfo.php b/php/src/apache/shindig/gadgets/oauth/AccesorInfo.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/AccesorInfo.php
rename to php/src/apache/shindig/gadgets/oauth/AccesorInfo.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/BasicGadgetOAuthTokenStore.php b/php/src/apache/shindig/gadgets/oauth/BasicGadgetOAuthTokenStore.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/BasicGadgetOAuthTokenStore.php
rename to php/src/apache/shindig/gadgets/oauth/BasicGadgetOAuthTokenStore.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/BasicOAuthStore.php b/php/src/apache/shindig/gadgets/oauth/BasicOAuthStore.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/BasicOAuthStore.php
rename to php/src/apache/shindig/gadgets/oauth/BasicOAuthStore.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/ConsumerKeyAndSecret.php b/php/src/apache/shindig/gadgets/oauth/ConsumerKeyAndSecret.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/ConsumerKeyAndSecret.php
rename to php/src/apache/shindig/gadgets/oauth/ConsumerKeyAndSecret.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/Endpoint.php b/php/src/apache/shindig/gadgets/oauth/Endpoint.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/Endpoint.php
rename to php/src/apache/shindig/gadgets/oauth/Endpoint.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/GadgetInfo.php b/php/src/apache/shindig/gadgets/oauth/GadgetInfo.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/GadgetInfo.php
rename to php/src/apache/shindig/gadgets/oauth/GadgetInfo.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.php b/php/src/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.php
rename to php/src/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/Location.php b/php/src/apache/shindig/gadgets/oauth/Location.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/Location.php
rename to php/src/apache/shindig/gadgets/oauth/Location.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/Method.php b/php/src/apache/shindig/gadgets/oauth/Method.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/Method.php
rename to php/src/apache/shindig/gadgets/oauth/Method.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuth2Fetcher.php b/php/src/apache/shindig/gadgets/oauth/OAuth2Fetcher.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuth2Fetcher.php
rename to php/src/apache/shindig/gadgets/oauth/OAuth2Fetcher.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthAccessor.php b/php/src/apache/shindig/gadgets/oauth/OAuthAccessor.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthAccessor.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthAccessor.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthCallbackState.php b/php/src/apache/shindig/gadgets/oauth/OAuthCallbackState.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthCallbackState.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthCallbackState.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthError.php b/php/src/apache/shindig/gadgets/oauth/OAuthError.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthError.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthError.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthFetcher.php b/php/src/apache/shindig/gadgets/oauth/OAuthFetcher.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthFetcher.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthFetcher.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthFetcherFactory.php b/php/src/apache/shindig/gadgets/oauth/OAuthFetcherFactory.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthFetcherFactory.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthFetcherFactory.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthRequestParams.php b/php/src/apache/shindig/gadgets/oauth/OAuthRequestParams.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthRequestParams.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthRequestParams.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthService.php b/php/src/apache/shindig/gadgets/oauth/OAuthService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthService.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthService.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthServiceProvider.php b/php/src/apache/shindig/gadgets/oauth/OAuthServiceProvider.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthServiceProvider.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthServiceProvider.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthSpec.php b/php/src/apache/shindig/gadgets/oauth/OAuthSpec.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthSpec.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthSpec.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthStore.php b/php/src/apache/shindig/gadgets/oauth/OAuthStore.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthStore.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthStore.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthStoreException.php b/php/src/apache/shindig/gadgets/oauth/OAuthStoreException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthStoreException.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthStoreException.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/OAuthStoreVars.php b/php/src/apache/shindig/gadgets/oauth/OAuthStoreVars.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/OAuthStoreVars.php
rename to php/src/apache/shindig/gadgets/oauth/OAuthStoreVars.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/ProviderInfo.php b/php/src/apache/shindig/gadgets/oauth/ProviderInfo.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/ProviderInfo.php
rename to php/src/apache/shindig/gadgets/oauth/ProviderInfo.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/ProviderKey.php b/php/src/apache/shindig/gadgets/oauth/ProviderKey.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/ProviderKey.php
rename to php/src/apache/shindig/gadgets/oauth/ProviderKey.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/SpecParserException.php b/php/src/apache/shindig/gadgets/oauth/SpecParserException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/SpecParserException.php
rename to php/src/apache/shindig/gadgets/oauth/SpecParserException.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/TokenInfo.php b/php/src/apache/shindig/gadgets/oauth/TokenInfo.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/TokenInfo.php
rename to php/src/apache/shindig/gadgets/oauth/TokenInfo.php
diff --git a/trunk/php/src/apache/shindig/gadgets/oauth/TokenKey.php b/php/src/apache/shindig/gadgets/oauth/TokenKey.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/oauth/TokenKey.php
rename to php/src/apache/shindig/gadgets/oauth/TokenKey.php
diff --git a/trunk/php/src/apache/shindig/gadgets/render/EmptyClass.php b/php/src/apache/shindig/gadgets/render/EmptyClass.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/render/EmptyClass.php
rename to php/src/apache/shindig/gadgets/render/EmptyClass.php
diff --git a/trunk/php/src/apache/shindig/gadgets/render/GadgetBaseRenderer.php b/php/src/apache/shindig/gadgets/render/GadgetBaseRenderer.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/render/GadgetBaseRenderer.php
rename to php/src/apache/shindig/gadgets/render/GadgetBaseRenderer.php
diff --git a/trunk/php/src/apache/shindig/gadgets/render/GadgetHrefRenderer.php b/php/src/apache/shindig/gadgets/render/GadgetHrefRenderer.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/render/GadgetHrefRenderer.php
rename to php/src/apache/shindig/gadgets/render/GadgetHrefRenderer.php
diff --git a/trunk/php/src/apache/shindig/gadgets/render/GadgetHtmlRenderer.php b/php/src/apache/shindig/gadgets/render/GadgetHtmlRenderer.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/render/GadgetHtmlRenderer.php
rename to php/src/apache/shindig/gadgets/render/GadgetHtmlRenderer.php
diff --git a/trunk/php/src/apache/shindig/gadgets/render/GadgetRenderer.php b/php/src/apache/shindig/gadgets/render/GadgetRenderer.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/render/GadgetRenderer.php
rename to php/src/apache/shindig/gadgets/render/GadgetRenderer.php
diff --git a/trunk/php/src/apache/shindig/gadgets/render/GadgetUrlRenderer.php b/php/src/apache/shindig/gadgets/render/GadgetUrlRenderer.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/render/GadgetUrlRenderer.php
rename to php/src/apache/shindig/gadgets/render/GadgetUrlRenderer.php
diff --git a/trunk/php/src/apache/shindig/gadgets/rewrite/ContentRewriter.php b/php/src/apache/shindig/gadgets/rewrite/ContentRewriter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/rewrite/ContentRewriter.php
rename to php/src/apache/shindig/gadgets/rewrite/ContentRewriter.php
diff --git a/trunk/php/src/apache/shindig/gadgets/rewrite/DomRewriter.php b/php/src/apache/shindig/gadgets/rewrite/DomRewriter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/rewrite/DomRewriter.php
rename to php/src/apache/shindig/gadgets/rewrite/DomRewriter.php
diff --git a/trunk/php/src/apache/shindig/gadgets/rewrite/GadgetRewriter.php b/php/src/apache/shindig/gadgets/rewrite/GadgetRewriter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/rewrite/GadgetRewriter.php
rename to php/src/apache/shindig/gadgets/rewrite/GadgetRewriter.php
diff --git a/trunk/php/src/apache/shindig/gadgets/rewrite/SanitizeRewriter.php b/php/src/apache/shindig/gadgets/rewrite/SanitizeRewriter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/rewrite/SanitizeRewriter.php
rename to php/src/apache/shindig/gadgets/rewrite/SanitizeRewriter.php
diff --git a/trunk/php/src/apache/shindig/gadgets/sample/BasicGadgetBlacklist.php b/php/src/apache/shindig/gadgets/sample/BasicGadgetBlacklist.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/sample/BasicGadgetBlacklist.php
rename to php/src/apache/shindig/gadgets/sample/BasicGadgetBlacklist.php
diff --git a/trunk/php/src/apache/shindig/gadgets/sample/BasicGadgetSpecFactory.php b/php/src/apache/shindig/gadgets/sample/BasicGadgetSpecFactory.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/sample/BasicGadgetSpecFactory.php
rename to php/src/apache/shindig/gadgets/sample/BasicGadgetSpecFactory.php
diff --git a/trunk/php/src/apache/shindig/gadgets/servlet/CertServlet.php b/php/src/apache/shindig/gadgets/servlet/CertServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/servlet/CertServlet.php
rename to php/src/apache/shindig/gadgets/servlet/CertServlet.php
diff --git a/trunk/php/src/apache/shindig/gadgets/servlet/ContentFilesServlet.php b/php/src/apache/shindig/gadgets/servlet/ContentFilesServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/servlet/ContentFilesServlet.php
rename to php/src/apache/shindig/gadgets/servlet/ContentFilesServlet.php
diff --git a/trunk/php/src/apache/shindig/gadgets/servlet/FilesServlet.php b/php/src/apache/shindig/gadgets/servlet/FilesServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/servlet/FilesServlet.php
rename to php/src/apache/shindig/gadgets/servlet/FilesServlet.php
diff --git a/trunk/php/src/apache/shindig/gadgets/servlet/GadgetRenderingServlet.php b/php/src/apache/shindig/gadgets/servlet/GadgetRenderingServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/servlet/GadgetRenderingServlet.php
rename to php/src/apache/shindig/gadgets/servlet/GadgetRenderingServlet.php
diff --git a/trunk/php/src/apache/shindig/gadgets/servlet/JsServlet.php b/php/src/apache/shindig/gadgets/servlet/JsServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/servlet/JsServlet.php
rename to php/src/apache/shindig/gadgets/servlet/JsServlet.php
diff --git a/trunk/php/src/apache/shindig/gadgets/servlet/MakeRequestServlet.php b/php/src/apache/shindig/gadgets/servlet/MakeRequestServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/servlet/MakeRequestServlet.php
rename to php/src/apache/shindig/gadgets/servlet/MakeRequestServlet.php
diff --git a/trunk/php/src/apache/shindig/gadgets/servlet/MetadataServlet.php b/php/src/apache/shindig/gadgets/servlet/MetadataServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/servlet/MetadataServlet.php
rename to php/src/apache/shindig/gadgets/servlet/MetadataServlet.php
diff --git a/trunk/php/src/apache/shindig/gadgets/servlet/OAuthCallbackServlet.php b/php/src/apache/shindig/gadgets/servlet/OAuthCallbackServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/servlet/OAuthCallbackServlet.php
rename to php/src/apache/shindig/gadgets/servlet/OAuthCallbackServlet.php
diff --git a/trunk/php/src/apache/shindig/gadgets/servlet/ProxyServlet.php b/php/src/apache/shindig/gadgets/servlet/ProxyServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/servlet/ProxyServlet.php
rename to php/src/apache/shindig/gadgets/servlet/ProxyServlet.php
diff --git a/trunk/php/src/apache/shindig/gadgets/servlet/ResourcesFilesServlet.php b/php/src/apache/shindig/gadgets/servlet/ResourcesFilesServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/servlet/ResourcesFilesServlet.php
rename to php/src/apache/shindig/gadgets/servlet/ResourcesFilesServlet.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/DataPipelining.php b/php/src/apache/shindig/gadgets/templates/DataPipelining.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/DataPipelining.php
rename to php/src/apache/shindig/gadgets/templates/DataPipelining.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/ExpLexer.php b/php/src/apache/shindig/gadgets/templates/ExpLexer.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/ExpLexer.php
rename to php/src/apache/shindig/gadgets/templates/ExpLexer.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/ExpLexerException.php b/php/src/apache/shindig/gadgets/templates/ExpLexerException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/ExpLexerException.php
rename to php/src/apache/shindig/gadgets/templates/ExpLexerException.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/ExpParser.php b/php/src/apache/shindig/gadgets/templates/ExpParser.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/ExpParser.php
rename to php/src/apache/shindig/gadgets/templates/ExpParser.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/ExpParserException.php b/php/src/apache/shindig/gadgets/templates/ExpParserException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/ExpParserException.php
rename to php/src/apache/shindig/gadgets/templates/ExpParserException.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/ExpType.php b/php/src/apache/shindig/gadgets/templates/ExpType.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/ExpType.php
rename to php/src/apache/shindig/gadgets/templates/ExpType.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/ExpTypeException.php b/php/src/apache/shindig/gadgets/templates/ExpTypeException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/ExpTypeException.php
rename to php/src/apache/shindig/gadgets/templates/ExpTypeException.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/ExpressionException.php b/php/src/apache/shindig/gadgets/templates/ExpressionException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/ExpressionException.php
rename to php/src/apache/shindig/gadgets/templates/ExpressionException.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/ExpressionParser.php b/php/src/apache/shindig/gadgets/templates/ExpressionParser.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/ExpressionParser.php
rename to php/src/apache/shindig/gadgets/templates/ExpressionParser.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/PrimitiveExp.php b/php/src/apache/shindig/gadgets/templates/PrimitiveExp.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/PrimitiveExp.php
rename to php/src/apache/shindig/gadgets/templates/PrimitiveExp.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/SwfConfig.php b/php/src/apache/shindig/gadgets/templates/SwfConfig.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/SwfConfig.php
rename to php/src/apache/shindig/gadgets/templates/SwfConfig.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/TemplateLibrary.php b/php/src/apache/shindig/gadgets/templates/TemplateLibrary.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/TemplateLibrary.php
rename to php/src/apache/shindig/gadgets/templates/TemplateLibrary.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/TemplateLibraryContent.php b/php/src/apache/shindig/gadgets/templates/TemplateLibraryContent.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/TemplateLibraryContent.php
rename to php/src/apache/shindig/gadgets/templates/TemplateLibraryContent.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/TemplateLibraryEntry.php b/php/src/apache/shindig/gadgets/templates/TemplateLibraryEntry.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/TemplateLibraryEntry.php
rename to php/src/apache/shindig/gadgets/templates/TemplateLibraryEntry.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/TemplateParser.php b/php/src/apache/shindig/gadgets/templates/TemplateParser.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/TemplateParser.php
rename to php/src/apache/shindig/gadgets/templates/TemplateParser.php
diff --git a/trunk/php/src/apache/shindig/gadgets/templates/Token.php b/php/src/apache/shindig/gadgets/templates/Token.php
similarity index 100%
rename from trunk/php/src/apache/shindig/gadgets/templates/Token.php
rename to php/src/apache/shindig/gadgets/templates/Token.php
diff --git a/trunk/php/src/apache/shindig/social/converters/InputActivitiesConverter.php b/php/src/apache/shindig/social/converters/InputActivitiesConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/InputActivitiesConverter.php
rename to php/src/apache/shindig/social/converters/InputActivitiesConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/InputAlbumsConverter.php b/php/src/apache/shindig/social/converters/InputAlbumsConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/InputAlbumsConverter.php
rename to php/src/apache/shindig/social/converters/InputAlbumsConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/InputAppDataConverter.php b/php/src/apache/shindig/social/converters/InputAppDataConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/InputAppDataConverter.php
rename to php/src/apache/shindig/social/converters/InputAppDataConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/InputBasicXmlConverter.php b/php/src/apache/shindig/social/converters/InputBasicXmlConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/InputBasicXmlConverter.php
rename to php/src/apache/shindig/social/converters/InputBasicXmlConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/InputConverter.php b/php/src/apache/shindig/social/converters/InputConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/InputConverter.php
rename to php/src/apache/shindig/social/converters/InputConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/InputInvalidateConverter.php b/php/src/apache/shindig/social/converters/InputInvalidateConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/InputInvalidateConverter.php
rename to php/src/apache/shindig/social/converters/InputInvalidateConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/InputMediaItemsConverter.php b/php/src/apache/shindig/social/converters/InputMediaItemsConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/InputMediaItemsConverter.php
rename to php/src/apache/shindig/social/converters/InputMediaItemsConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/InputMessagesConverter.php b/php/src/apache/shindig/social/converters/InputMessagesConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/InputMessagesConverter.php
rename to php/src/apache/shindig/social/converters/InputMessagesConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/InputPeopleConverter.php b/php/src/apache/shindig/social/converters/InputPeopleConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/InputPeopleConverter.php
rename to php/src/apache/shindig/social/converters/InputPeopleConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/OutputAtomConverter.php b/php/src/apache/shindig/social/converters/OutputAtomConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/OutputAtomConverter.php
rename to php/src/apache/shindig/social/converters/OutputAtomConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/OutputBasicXmlConverter.php b/php/src/apache/shindig/social/converters/OutputBasicXmlConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/OutputBasicXmlConverter.php
rename to php/src/apache/shindig/social/converters/OutputBasicXmlConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/OutputConverter.php b/php/src/apache/shindig/social/converters/OutputConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/OutputConverter.php
rename to php/src/apache/shindig/social/converters/OutputConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/OutputJsonConverter.php b/php/src/apache/shindig/social/converters/OutputJsonConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/OutputJsonConverter.php
rename to php/src/apache/shindig/social/converters/OutputJsonConverter.php
diff --git a/trunk/php/src/apache/shindig/social/converters/OutputXmlConverter.php b/php/src/apache/shindig/social/converters/OutputXmlConverter.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/converters/OutputXmlConverter.php
rename to php/src/apache/shindig/social/converters/OutputXmlConverter.php
diff --git a/trunk/php/src/apache/shindig/social/model/Account.php b/php/src/apache/shindig/social/model/Account.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Account.php
rename to php/src/apache/shindig/social/model/Account.php
diff --git a/trunk/php/src/apache/shindig/social/model/Activity.php b/php/src/apache/shindig/social/model/Activity.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Activity.php
rename to php/src/apache/shindig/social/model/Activity.php
diff --git a/trunk/php/src/apache/shindig/social/model/Address.php b/php/src/apache/shindig/social/model/Address.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Address.php
rename to php/src/apache/shindig/social/model/Address.php
diff --git a/trunk/php/src/apache/shindig/social/model/Album.php b/php/src/apache/shindig/social/model/Album.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Album.php
rename to php/src/apache/shindig/social/model/Album.php
diff --git a/trunk/php/src/apache/shindig/social/model/ApiCollection.php b/php/src/apache/shindig/social/model/ApiCollection.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/ApiCollection.php
rename to php/src/apache/shindig/social/model/ApiCollection.php
diff --git a/trunk/php/src/apache/shindig/social/model/BodyType.php b/php/src/apache/shindig/social/model/BodyType.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/BodyType.php
rename to php/src/apache/shindig/social/model/BodyType.php
diff --git a/trunk/php/src/apache/shindig/social/model/ComplexField.php b/php/src/apache/shindig/social/model/ComplexField.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/ComplexField.php
rename to php/src/apache/shindig/social/model/ComplexField.php
diff --git a/trunk/php/src/apache/shindig/social/model/Email.php b/php/src/apache/shindig/social/model/Email.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Email.php
rename to php/src/apache/shindig/social/model/Email.php
diff --git a/trunk/php/src/apache/shindig/social/model/Enum.php b/php/src/apache/shindig/social/model/Enum.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Enum.php
rename to php/src/apache/shindig/social/model/Enum.php
diff --git a/trunk/php/src/apache/shindig/social/model/EnumDrinker.php b/php/src/apache/shindig/social/model/EnumDrinker.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/EnumDrinker.php
rename to php/src/apache/shindig/social/model/EnumDrinker.php
diff --git a/trunk/php/src/apache/shindig/social/model/EnumGender.php b/php/src/apache/shindig/social/model/EnumGender.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/EnumGender.php
rename to php/src/apache/shindig/social/model/EnumGender.php
diff --git a/trunk/php/src/apache/shindig/social/model/EnumLookingFor.php b/php/src/apache/shindig/social/model/EnumLookingFor.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/EnumLookingFor.php
rename to php/src/apache/shindig/social/model/EnumLookingFor.php
diff --git a/trunk/php/src/apache/shindig/social/model/EnumPresence.php b/php/src/apache/shindig/social/model/EnumPresence.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/EnumPresence.php
rename to php/src/apache/shindig/social/model/EnumPresence.php
diff --git a/trunk/php/src/apache/shindig/social/model/EnumSmoker.php b/php/src/apache/shindig/social/model/EnumSmoker.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/EnumSmoker.php
rename to php/src/apache/shindig/social/model/EnumSmoker.php
diff --git a/trunk/php/src/apache/shindig/social/model/IdSpec.php b/php/src/apache/shindig/social/model/IdSpec.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/IdSpec.php
rename to php/src/apache/shindig/social/model/IdSpec.php
diff --git a/trunk/php/src/apache/shindig/social/model/Im.php b/php/src/apache/shindig/social/model/Im.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Im.php
rename to php/src/apache/shindig/social/model/Im.php
diff --git a/trunk/php/src/apache/shindig/social/model/ListField.php b/php/src/apache/shindig/social/model/ListField.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/ListField.php
rename to php/src/apache/shindig/social/model/ListField.php
diff --git a/trunk/php/src/apache/shindig/social/model/MediaItem.php b/php/src/apache/shindig/social/model/MediaItem.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/MediaItem.php
rename to php/src/apache/shindig/social/model/MediaItem.php
diff --git a/trunk/php/src/apache/shindig/social/model/Message.php b/php/src/apache/shindig/social/model/Message.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Message.php
rename to php/src/apache/shindig/social/model/Message.php
diff --git a/trunk/php/src/apache/shindig/social/model/MessageCollection.php b/php/src/apache/shindig/social/model/MessageCollection.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/MessageCollection.php
rename to php/src/apache/shindig/social/model/MessageCollection.php
diff --git a/trunk/php/src/apache/shindig/social/model/Name.php b/php/src/apache/shindig/social/model/Name.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Name.php
rename to php/src/apache/shindig/social/model/Name.php
diff --git a/trunk/php/src/apache/shindig/social/model/Organization.php b/php/src/apache/shindig/social/model/Organization.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Organization.php
rename to php/src/apache/shindig/social/model/Organization.php
diff --git a/trunk/php/src/apache/shindig/social/model/Person.php b/php/src/apache/shindig/social/model/Person.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Person.php
rename to php/src/apache/shindig/social/model/Person.php
diff --git a/trunk/php/src/apache/shindig/social/model/Phone.php b/php/src/apache/shindig/social/model/Phone.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Phone.php
rename to php/src/apache/shindig/social/model/Phone.php
diff --git a/trunk/php/src/apache/shindig/social/model/Photo.php b/php/src/apache/shindig/social/model/Photo.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Photo.php
rename to php/src/apache/shindig/social/model/Photo.php
diff --git a/trunk/php/src/apache/shindig/social/model/Url.php b/php/src/apache/shindig/social/model/Url.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/model/Url.php
rename to php/src/apache/shindig/social/model/Url.php
diff --git a/trunk/php/src/apache/shindig/social/oauth/OAuthSecurityToken.php b/php/src/apache/shindig/social/oauth/OAuthSecurityToken.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/oauth/OAuthSecurityToken.php
rename to php/src/apache/shindig/social/oauth/OAuthSecurityToken.php
diff --git a/trunk/php/src/apache/shindig/social/sample/DefaultInvalidateService.php b/php/src/apache/shindig/social/sample/DefaultInvalidateService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/sample/DefaultInvalidateService.php
rename to php/src/apache/shindig/social/sample/DefaultInvalidateService.php
diff --git a/trunk/php/src/apache/shindig/social/sample/JsonDbOpensocialService.php b/php/src/apache/shindig/social/sample/JsonDbOpensocialService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/sample/JsonDbOpensocialService.php
rename to php/src/apache/shindig/social/sample/JsonDbOpensocialService.php
diff --git a/trunk/php/src/apache/shindig/social/service/ActivityHandler.php b/php/src/apache/shindig/social/service/ActivityHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/ActivityHandler.php
rename to php/src/apache/shindig/social/service/ActivityHandler.php
diff --git a/trunk/php/src/apache/shindig/social/service/AlbumHandler.php b/php/src/apache/shindig/social/service/AlbumHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/AlbumHandler.php
rename to php/src/apache/shindig/social/service/AlbumHandler.php
diff --git a/trunk/php/src/apache/shindig/social/service/AppDataHandler.php b/php/src/apache/shindig/social/service/AppDataHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/AppDataHandler.php
rename to php/src/apache/shindig/social/service/AppDataHandler.php
diff --git a/trunk/php/src/apache/shindig/social/service/DataRequestHandler.php b/php/src/apache/shindig/social/service/DataRequestHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/DataRequestHandler.php
rename to php/src/apache/shindig/social/service/DataRequestHandler.php
diff --git a/trunk/php/src/apache/shindig/social/service/GroupHandler.php b/php/src/apache/shindig/social/service/GroupHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/GroupHandler.php
rename to php/src/apache/shindig/social/service/GroupHandler.php
diff --git a/trunk/php/src/apache/shindig/social/service/HandlerPreconditions.php b/php/src/apache/shindig/social/service/HandlerPreconditions.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/HandlerPreconditions.php
rename to php/src/apache/shindig/social/service/HandlerPreconditions.php
diff --git a/trunk/php/src/apache/shindig/social/service/HttpHandler.php b/php/src/apache/shindig/social/service/HttpHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/HttpHandler.php
rename to php/src/apache/shindig/social/service/HttpHandler.php
diff --git a/trunk/php/src/apache/shindig/social/service/InvalidateHandler.php b/php/src/apache/shindig/social/service/InvalidateHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/InvalidateHandler.php
rename to php/src/apache/shindig/social/service/InvalidateHandler.php
diff --git a/trunk/php/src/apache/shindig/social/service/MediaItemHandler.php b/php/src/apache/shindig/social/service/MediaItemHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/MediaItemHandler.php
rename to php/src/apache/shindig/social/service/MediaItemHandler.php
diff --git a/trunk/php/src/apache/shindig/social/service/MessagesHandler.php b/php/src/apache/shindig/social/service/MessagesHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/MessagesHandler.php
rename to php/src/apache/shindig/social/service/MessagesHandler.php
diff --git a/trunk/php/src/apache/shindig/social/service/PersonHandler.php b/php/src/apache/shindig/social/service/PersonHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/PersonHandler.php
rename to php/src/apache/shindig/social/service/PersonHandler.php
diff --git a/trunk/php/src/apache/shindig/social/service/RequestItem.php b/php/src/apache/shindig/social/service/RequestItem.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/RequestItem.php
rename to php/src/apache/shindig/social/service/RequestItem.php
diff --git a/trunk/php/src/apache/shindig/social/service/ResponseError.php b/php/src/apache/shindig/social/service/ResponseError.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/ResponseError.php
rename to php/src/apache/shindig/social/service/ResponseError.php
diff --git a/trunk/php/src/apache/shindig/social/service/ResponseItem.php b/php/src/apache/shindig/social/service/ResponseItem.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/ResponseItem.php
rename to php/src/apache/shindig/social/service/ResponseItem.php
diff --git a/trunk/php/src/apache/shindig/social/service/RestRequestItem.php b/php/src/apache/shindig/social/service/RestRequestItem.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/RestRequestItem.php
rename to php/src/apache/shindig/social/service/RestRequestItem.php
diff --git a/trunk/php/src/apache/shindig/social/service/RpcRequestItem.php b/php/src/apache/shindig/social/service/RpcRequestItem.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/RpcRequestItem.php
rename to php/src/apache/shindig/social/service/RpcRequestItem.php
diff --git a/trunk/php/src/apache/shindig/social/service/SocialSpiException.php b/php/src/apache/shindig/social/service/SocialSpiException.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/SocialSpiException.php
rename to php/src/apache/shindig/social/service/SocialSpiException.php
diff --git a/trunk/php/src/apache/shindig/social/service/SystemHandler.php b/php/src/apache/shindig/social/service/SystemHandler.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/service/SystemHandler.php
rename to php/src/apache/shindig/social/service/SystemHandler.php
diff --git a/trunk/php/src/apache/shindig/social/servlet/ApiServlet.php b/php/src/apache/shindig/social/servlet/ApiServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/servlet/ApiServlet.php
rename to php/src/apache/shindig/social/servlet/ApiServlet.php
diff --git a/trunk/php/src/apache/shindig/social/servlet/CompatibilityJsonRpcServlet.php b/php/src/apache/shindig/social/servlet/CompatibilityJsonRpcServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/servlet/CompatibilityJsonRpcServlet.php
rename to php/src/apache/shindig/social/servlet/CompatibilityJsonRpcServlet.php
diff --git a/trunk/php/src/apache/shindig/social/servlet/DataServiceServlet.php b/php/src/apache/shindig/social/servlet/DataServiceServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/servlet/DataServiceServlet.php
rename to php/src/apache/shindig/social/servlet/DataServiceServlet.php
diff --git a/trunk/php/src/apache/shindig/social/servlet/JsonRpcServlet.php b/php/src/apache/shindig/social/servlet/JsonRpcServlet.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/servlet/JsonRpcServlet.php
rename to php/src/apache/shindig/social/servlet/JsonRpcServlet.php
diff --git a/trunk/php/src/apache/shindig/social/spi/ActivityService.php b/php/src/apache/shindig/social/spi/ActivityService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/ActivityService.php
rename to php/src/apache/shindig/social/spi/ActivityService.php
diff --git a/trunk/php/src/apache/shindig/social/spi/AlbumService.php b/php/src/apache/shindig/social/spi/AlbumService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/AlbumService.php
rename to php/src/apache/shindig/social/spi/AlbumService.php
diff --git a/trunk/php/src/apache/shindig/social/spi/AppDataService.php b/php/src/apache/shindig/social/spi/AppDataService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/AppDataService.php
rename to php/src/apache/shindig/social/spi/AppDataService.php
diff --git a/trunk/php/src/apache/shindig/social/spi/CollectionOptions.php b/php/src/apache/shindig/social/spi/CollectionOptions.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/CollectionOptions.php
rename to php/src/apache/shindig/social/spi/CollectionOptions.php
diff --git a/trunk/php/src/apache/shindig/social/spi/DataCollection.php b/php/src/apache/shindig/social/spi/DataCollection.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/DataCollection.php
rename to php/src/apache/shindig/social/spi/DataCollection.php
diff --git a/trunk/php/src/apache/shindig/social/spi/GroupId.php b/php/src/apache/shindig/social/spi/GroupId.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/GroupId.php
rename to php/src/apache/shindig/social/spi/GroupId.php
diff --git a/trunk/php/src/apache/shindig/social/spi/GroupService.php b/php/src/apache/shindig/social/spi/GroupService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/GroupService.php
rename to php/src/apache/shindig/social/spi/GroupService.php
diff --git a/trunk/php/src/apache/shindig/social/spi/InvalidateService.php b/php/src/apache/shindig/social/spi/InvalidateService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/InvalidateService.php
rename to php/src/apache/shindig/social/spi/InvalidateService.php
diff --git a/trunk/php/src/apache/shindig/social/spi/MediaItemService.php b/php/src/apache/shindig/social/spi/MediaItemService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/MediaItemService.php
rename to php/src/apache/shindig/social/spi/MediaItemService.php
diff --git a/trunk/php/src/apache/shindig/social/spi/MessagesService.php b/php/src/apache/shindig/social/spi/MessagesService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/MessagesService.php
rename to php/src/apache/shindig/social/spi/MessagesService.php
diff --git a/trunk/php/src/apache/shindig/social/spi/PersonService.php b/php/src/apache/shindig/social/spi/PersonService.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/PersonService.php
rename to php/src/apache/shindig/social/spi/PersonService.php
diff --git a/trunk/php/src/apache/shindig/social/spi/RestfulCollection.php b/php/src/apache/shindig/social/spi/RestfulCollection.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/RestfulCollection.php
rename to php/src/apache/shindig/social/spi/RestfulCollection.php
diff --git a/trunk/php/src/apache/shindig/social/spi/UserId.php b/php/src/apache/shindig/social/spi/UserId.php
similarity index 100%
rename from trunk/php/src/apache/shindig/social/spi/UserId.php
rename to php/src/apache/shindig/social/spi/UserId.php
diff --git a/trunk/php/test/bootstrap.php b/php/test/bootstrap.php
similarity index 100%
rename from trunk/php/test/bootstrap.php
rename to php/test/bootstrap.php
diff --git a/trunk/php/test/certs/README b/php/test/certs/README
similarity index 100%
rename from trunk/php/test/certs/README
rename to php/test/certs/README
diff --git a/trunk/php/test/certs/private.key b/php/test/certs/private.key
similarity index 100%
rename from trunk/php/test/certs/private.key
rename to php/test/certs/private.key
diff --git a/trunk/php/test/certs/public.crt b/php/test/certs/public.crt
similarity index 100%
rename from trunk/php/test/certs/public.crt
rename to php/test/certs/public.crt
diff --git a/trunk/php/test/common/BasicBlobCrypterTest.php b/php/test/common/BasicBlobCrypterTest.php
similarity index 100%
rename from trunk/php/test/common/BasicBlobCrypterTest.php
rename to php/test/common/BasicBlobCrypterTest.php
diff --git a/trunk/php/test/common/BasicRemoteContentTest.php b/php/test/common/BasicRemoteContentTest.php
similarity index 100%
rename from trunk/php/test/common/BasicRemoteContentTest.php
rename to php/test/common/BasicRemoteContentTest.php
diff --git a/trunk/php/test/common/BasicSecurityTokenTest.php b/php/test/common/BasicSecurityTokenTest.php
similarity index 100%
rename from trunk/php/test/common/BasicSecurityTokenTest.php
rename to php/test/common/BasicSecurityTokenTest.php
diff --git a/trunk/php/test/common/CacheFileTest.php b/php/test/common/CacheFileTest.php
similarity index 100%
rename from trunk/php/test/common/CacheFileTest.php
rename to php/test/common/CacheFileTest.php
diff --git a/trunk/php/test/common/CacheMemcacheTest.php b/php/test/common/CacheMemcacheTest.php
similarity index 100%
rename from trunk/php/test/common/CacheMemcacheTest.php
rename to php/test/common/CacheMemcacheTest.php
diff --git a/trunk/php/test/common/CryptoTest.php b/php/test/common/CryptoTest.php
similarity index 100%
rename from trunk/php/test/common/CryptoTest.php
rename to php/test/common/CryptoTest.php
diff --git a/trunk/php/test/common/HttpServletTest.php b/php/test/common/HttpServletTest.php
similarity index 100%
rename from trunk/php/test/common/HttpServletTest.php
rename to php/test/common/HttpServletTest.php
diff --git a/trunk/php/test/common/LocaleTest.php b/php/test/common/LocaleTest.php
similarity index 100%
rename from trunk/php/test/common/LocaleTest.php
rename to php/test/common/LocaleTest.php
diff --git a/trunk/php/test/common/OpenSocialVersionTest.php b/php/test/common/OpenSocialVersionTest.php
similarity index 100%
rename from trunk/php/test/common/OpenSocialVersionTest.php
rename to php/test/common/OpenSocialVersionTest.php
diff --git a/trunk/php/test/config/phpunit_to_surefire.xslt b/php/test/config/phpunit_to_surefire.xslt
similarity index 100%
rename from trunk/php/test/config/phpunit_to_surefire.xslt
rename to php/test/config/phpunit_to_surefire.xslt
diff --git a/trunk/php/test/gadgets/BasicGadgetBlacklistTest.php b/php/test/gadgets/BasicGadgetBlacklistTest.php
similarity index 100%
rename from trunk/php/test/gadgets/BasicGadgetBlacklistTest.php
rename to php/test/gadgets/BasicGadgetBlacklistTest.php
diff --git a/trunk/php/test/gadgets/ContainerConfigTest.php b/php/test/gadgets/ContainerConfigTest.php
similarity index 100%
rename from trunk/php/test/gadgets/ContainerConfigTest.php
rename to php/test/gadgets/ContainerConfigTest.php
diff --git a/trunk/php/test/gadgets/DataPipeliningTest.php b/php/test/gadgets/DataPipeliningTest.php
similarity index 100%
rename from trunk/php/test/gadgets/DataPipeliningTest.php
rename to php/test/gadgets/DataPipeliningTest.php
diff --git a/trunk/php/test/gadgets/ExpTypeTest.php b/php/test/gadgets/ExpTypeTest.php
similarity index 100%
rename from trunk/php/test/gadgets/ExpTypeTest.php
rename to php/test/gadgets/ExpTypeTest.php
diff --git a/trunk/php/test/gadgets/ExpressionParserTest.php b/php/test/gadgets/ExpressionParserTest.php
similarity index 100%
rename from trunk/php/test/gadgets/ExpressionParserTest.php
rename to php/test/gadgets/ExpressionParserTest.php
diff --git a/trunk/php/test/gadgets/FilesServletTest.php b/php/test/gadgets/FilesServletTest.php
similarity index 100%
rename from trunk/php/test/gadgets/FilesServletTest.php
rename to php/test/gadgets/FilesServletTest.php
diff --git a/trunk/php/test/gadgets/GadgetContextTest.php b/php/test/gadgets/GadgetContextTest.php
similarity index 100%
rename from trunk/php/test/gadgets/GadgetContextTest.php
rename to php/test/gadgets/GadgetContextTest.php
diff --git a/trunk/php/test/gadgets/GadgetFactoryTest.php b/php/test/gadgets/GadgetFactoryTest.php
similarity index 100%
rename from trunk/php/test/gadgets/GadgetFactoryTest.php
rename to php/test/gadgets/GadgetFactoryTest.php
diff --git a/trunk/php/test/gadgets/GadgetFeatureRegistryTest.php b/php/test/gadgets/GadgetFeatureRegistryTest.php
similarity index 100%
rename from trunk/php/test/gadgets/GadgetFeatureRegistryTest.php
rename to php/test/gadgets/GadgetFeatureRegistryTest.php
diff --git a/trunk/php/test/gadgets/GadgetHtmlRendererTest.php b/php/test/gadgets/GadgetHtmlRendererTest.php
similarity index 100%
rename from trunk/php/test/gadgets/GadgetHtmlRendererTest.php
rename to php/test/gadgets/GadgetHtmlRendererTest.php
diff --git a/trunk/php/test/gadgets/GadgetRenderingServletTest.php b/php/test/gadgets/GadgetRenderingServletTest.php
similarity index 100%
rename from trunk/php/test/gadgets/GadgetRenderingServletTest.php
rename to php/test/gadgets/GadgetRenderingServletTest.php
diff --git a/trunk/php/test/gadgets/GadgetRewriterTest.php b/php/test/gadgets/GadgetRewriterTest.php
similarity index 100%
rename from trunk/php/test/gadgets/GadgetRewriterTest.php
rename to php/test/gadgets/GadgetRewriterTest.php
diff --git a/trunk/php/test/gadgets/GadgetSpecParserTest.php b/php/test/gadgets/GadgetSpecParserTest.php
similarity index 100%
rename from trunk/php/test/gadgets/GadgetSpecParserTest.php
rename to php/test/gadgets/GadgetSpecParserTest.php
diff --git a/trunk/php/test/gadgets/GadgetTest.php b/php/test/gadgets/GadgetTest.php
similarity index 100%
rename from trunk/php/test/gadgets/GadgetTest.php
rename to php/test/gadgets/GadgetTest.php
diff --git a/trunk/php/test/gadgets/GadgetUrlRendererTest.php b/php/test/gadgets/GadgetUrlRendererTest.php
similarity index 100%
rename from trunk/php/test/gadgets/GadgetUrlRendererTest.php
rename to php/test/gadgets/GadgetUrlRendererTest.php
diff --git a/trunk/php/test/gadgets/MakeRequestTest.php b/php/test/gadgets/MakeRequestTest.php
similarity index 100%
rename from trunk/php/test/gadgets/MakeRequestTest.php
rename to php/test/gadgets/MakeRequestTest.php
diff --git a/trunk/php/test/gadgets/SigningFetcherTest.php b/php/test/gadgets/SigningFetcherTest.php
similarity index 100%
rename from trunk/php/test/gadgets/SigningFetcherTest.php
rename to php/test/gadgets/SigningFetcherTest.php
diff --git a/trunk/php/test/gadgets/SubstitutionsTest.php b/php/test/gadgets/SubstitutionsTest.php
similarity index 100%
rename from trunk/php/test/gadgets/SubstitutionsTest.php
rename to php/test/gadgets/SubstitutionsTest.php
diff --git a/trunk/php/test/gadgets/TemplateParserTest.php b/php/test/gadgets/TemplateParserTest.php
similarity index 100%
rename from trunk/php/test/gadgets/TemplateParserTest.php
rename to php/test/gadgets/TemplateParserTest.php
diff --git a/trunk/php/test/misc/activity/activity.xml b/php/test/misc/activity/activity.xml
similarity index 100%
rename from trunk/php/test/misc/activity/activity.xml
rename to php/test/misc/activity/activity.xml
diff --git a/trunk/php/test/misc/album/album.xml b/php/test/misc/album/album.xml
similarity index 100%
rename from trunk/php/test/misc/album/album.xml
rename to php/test/misc/album/album.xml
diff --git a/trunk/php/test/misc/feather.png b/php/test/misc/feather.png
similarity index 100%
rename from trunk/php/test/misc/feather.png
rename to php/test/misc/feather.png
Binary files differ
diff --git a/trunk/php/test/misc/invalidation/count.php b/php/test/misc/invalidation/count.php
similarity index 100%
rename from trunk/php/test/misc/invalidation/count.php
rename to php/test/misc/invalidation/count.php
diff --git a/trunk/php/test/misc/invalidation/invalidation.xml b/php/test/misc/invalidation/invalidation.xml
similarity index 100%
rename from trunk/php/test/misc/invalidation/invalidation.xml
rename to php/test/misc/invalidation/invalidation.xml
diff --git a/trunk/php/test/misc/ok.html b/php/test/misc/ok.html
similarity index 100%
rename from trunk/php/test/misc/ok.html
rename to php/test/misc/ok.html
diff --git a/trunk/php/test/misc/rewriter1.css b/php/test/misc/rewriter1.css
similarity index 100%
rename from trunk/php/test/misc/rewriter1.css
rename to php/test/misc/rewriter1.css
diff --git a/trunk/php/test/misc/rewriter1.js b/php/test/misc/rewriter1.js
similarity index 100%
rename from trunk/php/test/misc/rewriter1.js
rename to php/test/misc/rewriter1.js
diff --git a/trunk/php/test/misc/rewriter2.css b/php/test/misc/rewriter2.css
similarity index 100%
rename from trunk/php/test/misc/rewriter2.css
rename to php/test/misc/rewriter2.css
diff --git a/trunk/php/test/misc/rewriter2.js b/php/test/misc/rewriter2.js
similarity index 100%
rename from trunk/php/test/misc/rewriter2.js
rename to php/test/misc/rewriter2.js
diff --git a/trunk/php/test/misc/sampleAtomFeed.xml b/php/test/misc/sampleAtomFeed.xml
similarity index 100%
rename from trunk/php/test/misc/sampleAtomFeed.xml
rename to php/test/misc/sampleAtomFeed.xml
diff --git a/trunk/php/test/misc/sign.php b/php/test/misc/sign.php
similarity index 100%
rename from trunk/php/test/misc/sign.php
rename to php/test/misc/sign.php
diff --git a/trunk/php/test/misc/testGadget.xml b/php/test/misc/testGadget.xml
similarity index 100%
rename from trunk/php/test/misc/testGadget.xml
rename to php/test/misc/testGadget.xml
diff --git a/trunk/php/test/misc/testRest.php b/php/test/misc/testRest.php
similarity index 100%
rename from trunk/php/test/misc/testRest.php
rename to php/test/misc/testRest.php
diff --git a/trunk/php/test/misc/upload/upload.php b/php/test/misc/upload/upload.php
similarity index 100%
rename from trunk/php/test/misc/upload/upload.php
rename to php/test/misc/upload/upload.php
diff --git a/trunk/php/test/misc/upload/upload.xml b/php/test/misc/upload/upload.xml
similarity index 100%
rename from trunk/php/test/misc/upload/upload.xml
rename to php/test/misc/upload/upload.xml
diff --git a/trunk/php/test/social/ActivityRestTest.php b/php/test/social/ActivityRestTest.php
similarity index 100%
rename from trunk/php/test/social/ActivityRestTest.php
rename to php/test/social/ActivityRestTest.php
diff --git a/trunk/php/test/social/ActivityTest.php b/php/test/social/ActivityTest.php
similarity index 100%
rename from trunk/php/test/social/ActivityTest.php
rename to php/test/social/ActivityTest.php
diff --git a/trunk/php/test/social/AddressTest.php b/php/test/social/AddressTest.php
similarity index 100%
rename from trunk/php/test/social/AddressTest.php
rename to php/test/social/AddressTest.php
diff --git a/trunk/php/test/social/AlbumRestTest.php b/php/test/social/AlbumRestTest.php
similarity index 100%
rename from trunk/php/test/social/AlbumRestTest.php
rename to php/test/social/AlbumRestTest.php
diff --git a/trunk/php/test/social/ApiCollectionTest.php b/php/test/social/ApiCollectionTest.php
similarity index 100%
rename from trunk/php/test/social/ApiCollectionTest.php
rename to php/test/social/ApiCollectionTest.php
diff --git a/trunk/php/test/social/AppDataRestTest.php b/php/test/social/AppDataRestTest.php
similarity index 100%
rename from trunk/php/test/social/AppDataRestTest.php
rename to php/test/social/AppDataRestTest.php
diff --git a/trunk/php/test/social/BodyTypeTest.php b/php/test/social/BodyTypeTest.php
similarity index 100%
rename from trunk/php/test/social/BodyTypeTest.php
rename to php/test/social/BodyTypeTest.php
diff --git a/trunk/php/test/social/DefaultInvalidateServiceTest.php b/php/test/social/DefaultInvalidateServiceTest.php
similarity index 100%
rename from trunk/php/test/social/DefaultInvalidateServiceTest.php
rename to php/test/social/DefaultInvalidateServiceTest.php
diff --git a/trunk/php/test/social/EmailTest.php b/php/test/social/EmailTest.php
similarity index 100%
rename from trunk/php/test/social/EmailTest.php
rename to php/test/social/EmailTest.php
diff --git a/trunk/php/test/social/GroupIdTest.php b/php/test/social/GroupIdTest.php
similarity index 100%
rename from trunk/php/test/social/GroupIdTest.php
rename to php/test/social/GroupIdTest.php
diff --git a/trunk/php/test/social/GroupsRestTest.php b/php/test/social/GroupsRestTest.php
similarity index 100%
rename from trunk/php/test/social/GroupsRestTest.php
rename to php/test/social/GroupsRestTest.php
diff --git a/trunk/php/test/social/IdSpecTest.php b/php/test/social/IdSpecTest.php
similarity index 100%
rename from trunk/php/test/social/IdSpecTest.php
rename to php/test/social/IdSpecTest.php
diff --git a/trunk/php/test/social/InputActivitiesConverterTest.php b/php/test/social/InputActivitiesConverterTest.php
similarity index 100%
rename from trunk/php/test/social/InputActivitiesConverterTest.php
rename to php/test/social/InputActivitiesConverterTest.php
diff --git a/trunk/php/test/social/InputAlbumsConverterTest.php b/php/test/social/InputAlbumsConverterTest.php
similarity index 100%
rename from trunk/php/test/social/InputAlbumsConverterTest.php
rename to php/test/social/InputAlbumsConverterTest.php
diff --git a/trunk/php/test/social/InputAppDataConverterTest.php b/php/test/social/InputAppDataConverterTest.php
similarity index 100%
rename from trunk/php/test/social/InputAppDataConverterTest.php
rename to php/test/social/InputAppDataConverterTest.php
diff --git a/trunk/php/test/social/InputInvalidateConverterTest.php b/php/test/social/InputInvalidateConverterTest.php
similarity index 100%
rename from trunk/php/test/social/InputInvalidateConverterTest.php
rename to php/test/social/InputInvalidateConverterTest.php
diff --git a/trunk/php/test/social/InputMediaItemsConverterTest.php b/php/test/social/InputMediaItemsConverterTest.php
similarity index 100%
rename from trunk/php/test/social/InputMediaItemsConverterTest.php
rename to php/test/social/InputMediaItemsConverterTest.php
diff --git a/trunk/php/test/social/InputMessagesConverterTest.php b/php/test/social/InputMessagesConverterTest.php
similarity index 100%
rename from trunk/php/test/social/InputMessagesConverterTest.php
rename to php/test/social/InputMessagesConverterTest.php
diff --git a/trunk/php/test/social/InputPeopleConverterTest.php b/php/test/social/InputPeopleConverterTest.php
similarity index 100%
rename from trunk/php/test/social/InputPeopleConverterTest.php
rename to php/test/social/InputPeopleConverterTest.php
diff --git a/trunk/php/test/social/JsonDbOpensocialServiceTest.php b/php/test/social/JsonDbOpensocialServiceTest.php
similarity index 100%
rename from trunk/php/test/social/JsonDbOpensocialServiceTest.php
rename to php/test/social/JsonDbOpensocialServiceTest.php
diff --git a/trunk/php/test/social/JsonRpcServletTest.php b/php/test/social/JsonRpcServletTest.php
similarity index 100%
rename from trunk/php/test/social/JsonRpcServletTest.php
rename to php/test/social/JsonRpcServletTest.php
diff --git a/trunk/php/test/social/MediaItemRestTest.php b/php/test/social/MediaItemRestTest.php
similarity index 100%
rename from trunk/php/test/social/MediaItemRestTest.php
rename to php/test/social/MediaItemRestTest.php
diff --git a/trunk/php/test/social/MediaItemTest.php b/php/test/social/MediaItemTest.php
similarity index 100%
rename from trunk/php/test/social/MediaItemTest.php
rename to php/test/social/MediaItemTest.php
diff --git a/trunk/php/test/social/MessageRestTest.php b/php/test/social/MessageRestTest.php
similarity index 100%
rename from trunk/php/test/social/MessageRestTest.php
rename to php/test/social/MessageRestTest.php
diff --git a/trunk/php/test/social/MessageTest.php b/php/test/social/MessageTest.php
similarity index 100%
rename from trunk/php/test/social/MessageTest.php
rename to php/test/social/MessageTest.php
diff --git a/trunk/php/test/social/NameTest.php b/php/test/social/NameTest.php
similarity index 100%
rename from trunk/php/test/social/NameTest.php
rename to php/test/social/NameTest.php
diff --git a/trunk/php/test/social/OrganizationTest.php b/php/test/social/OrganizationTest.php
similarity index 100%
rename from trunk/php/test/social/OrganizationTest.php
rename to php/test/social/OrganizationTest.php
diff --git a/trunk/php/test/social/OutputAtomConverterTest.php b/php/test/social/OutputAtomConverterTest.php
similarity index 100%
rename from trunk/php/test/social/OutputAtomConverterTest.php
rename to php/test/social/OutputAtomConverterTest.php
diff --git a/trunk/php/test/social/OutputJsonConverterTest.php b/php/test/social/OutputJsonConverterTest.php
similarity index 100%
rename from trunk/php/test/social/OutputJsonConverterTest.php
rename to php/test/social/OutputJsonConverterTest.php
diff --git a/trunk/php/test/social/OutputXmlConverterTest.php b/php/test/social/OutputXmlConverterTest.php
similarity index 100%
rename from trunk/php/test/social/OutputXmlConverterTest.php
rename to php/test/social/OutputXmlConverterTest.php
diff --git a/trunk/php/test/social/PersonTest.php b/php/test/social/PersonTest.php
similarity index 100%
rename from trunk/php/test/social/PersonTest.php
rename to php/test/social/PersonTest.php
diff --git a/trunk/php/test/social/PhoneTest.php b/php/test/social/PhoneTest.php
similarity index 100%
rename from trunk/php/test/social/PhoneTest.php
rename to php/test/social/PhoneTest.php
diff --git a/trunk/php/test/social/ResponseItemTest.php b/php/test/social/ResponseItemTest.php
similarity index 100%
rename from trunk/php/test/social/ResponseItemTest.php
rename to php/test/social/ResponseItemTest.php
diff --git a/trunk/php/test/social/RestBase.php b/php/test/social/RestBase.php
similarity index 100%
rename from trunk/php/test/social/RestBase.php
rename to php/test/social/RestBase.php
diff --git a/trunk/php/test/social/RestFulCollectionTest.php b/php/test/social/RestFulCollectionTest.php
similarity index 100%
rename from trunk/php/test/social/RestFulCollectionTest.php
rename to php/test/social/RestFulCollectionTest.php
diff --git a/trunk/php/test/social/RestRequestItemTest.php b/php/test/social/RestRequestItemTest.php
similarity index 100%
rename from trunk/php/test/social/RestRequestItemTest.php
rename to php/test/social/RestRequestItemTest.php
diff --git a/trunk/php/test/social/UrlTest.php b/php/test/social/UrlTest.php
similarity index 100%
rename from trunk/php/test/social/UrlTest.php
rename to php/test/social/UrlTest.php
diff --git a/trunk/pom.xml b/pom.xml
similarity index 100%
rename from trunk/pom.xml
rename to pom.xml