Author: ivol37 at gmail.com
Date: Thu Nov 11 08:51:26 2010
New Revision: 386
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/oauth/
- copied from r385,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/oauth/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/
- copied from r385,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/osgi/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/
- copied from r385,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/
Removed:
trunk/amdatu-opensocial/shindig-application/src/main/assembly/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/oauth/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/osgi/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/ShindigRegistrationServiceImpl.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/oauth/AmdatuOAuthServlet.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/CassandraAppDataServiceStore.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/CassandraOAuthStore.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetColumnFamilyProvider.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/ShindigRegistrationServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/ShindigRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/ShindigRegistrationServiceImpl.java
Thu Nov 11 08:51:26 2010
@@ -16,7 +16,7 @@
*/
package org.amdatu.opensocial.shindig.application.service;
-import static
org.amdatu.opensocial.shindig.application.osgi.Activator.RESOURCE_ID;
+import static org.amdatu.opensocial.shindig.osgi.Activator.RESOURCE_ID;
import java.io.File;
import java.io.FileOutputStream;
@@ -33,8 +33,8 @@
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.oauth.AmdatuOAuthServlet;
-import org.amdatu.opensocial.shindig.application.osgi.Activator;
+import org.amdatu.opensocial.shindig.oauth.AmdatuOAuthServlet;
+import org.amdatu.opensocial.shindig.osgi.Activator;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.apache.shindig.auth.AuthenticationServletFilter;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/oauth/AmdatuOAuthServlet.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/oauth/AmdatuOAuthServlet.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/oauth/AmdatuOAuthServlet.java
Thu Nov 11 08:51:26 2010
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.amdatu.opensocial.shindig.application.oauth;
+package org.amdatu.opensocial.shindig.oauth;
import java.io.IOException;
import java.io.OutputStream;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
Thu Nov 11 08:51:26 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.opensocial.shindig.application.osgi;
+package org.amdatu.opensocial.shindig.osgi;
import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
@@ -24,16 +24,16 @@
import org.amdatu.opensocial.shindig.GadgetStore;
import org.amdatu.opensocial.shindig.OAuthModule;
import org.amdatu.opensocial.shindig.SocialApiModule;
-import
org.amdatu.opensocial.shindig.application.persistence.CassandraAppDataServiceStore;
-import
org.amdatu.opensocial.shindig.application.persistence.CassandraOAuthStore;
-import
org.amdatu.opensocial.shindig.application.persistence.GadgetColumnFamilyProvider;
-import org.amdatu.opensocial.shindig.application.persistence.GadgetStoreImpl;
import org.amdatu.opensocial.shindig.application.service.GuiceInjectorService;
import
org.amdatu.opensocial.shindig.application.service.GuiceInjectorServiceImpl;
import
org.amdatu.opensocial.shindig.application.service.ShindigRegistrationServiceImpl;
import org.amdatu.opensocial.shindig.module.ConfigurationAdminGuiceModule;
import org.amdatu.opensocial.shindig.module.OAuthModuleImpl;
import org.amdatu.opensocial.shindig.module.SocialApiModuleImpl;
+import org.amdatu.opensocial.shindig.persistence.CassandraAppDataServiceStore;
+import org.amdatu.opensocial.shindig.persistence.CassandraOAuthStore;
+import org.amdatu.opensocial.shindig.persistence.GadgetColumnFamilyProvider;
+import org.amdatu.opensocial.shindig.persistence.GadgetStoreImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.apache.shindig.gadgets.oauth.OAuthStore;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/CassandraAppDataServiceStore.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraAppDataServiceStore.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/CassandraAppDataServiceStore.java
Thu Nov 11 08:51:26 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.opensocial.shindig.application.persistence;
+package org.amdatu.opensocial.shindig.persistence;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/CassandraOAuthStore.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraOAuthStore.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/CassandraOAuthStore.java
Thu Nov 11 08:51:26 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.opensocial.shindig.application.persistence;
+package org.amdatu.opensocial.shindig.persistence;
import java.util.HashMap;
import java.util.Map;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetColumnFamilyProvider.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetColumnFamilyProvider.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetColumnFamilyProvider.java
Thu Nov 11 08:51:26 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.opensocial.shindig.application.persistence;
+package org.amdatu.opensocial.shindig.persistence;
import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition;
import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.ColumnType;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetStoreImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
Thu Nov 11 08:51:26 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.opensocial.shindig.application.persistence;
+package org.amdatu.opensocial.shindig.persistence;
import java.io.IOException;
import java.io.InputStream;
