Author: [email protected]
Date: Mon Aug 8 13:48:31 2011
New Revision: 1290
Log:
[AMDATUOPENSOCIAL-79] Refactoring packages - part 2
Added:
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/
- copied from r1288,
/trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/example/
trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/opensocial/example/
- copied from r1288,
/trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/example/
Removed:
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/example/
trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/example/
Modified:
trunk/amdatu-opensocial/examples/friends-gadget/pom.xml
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/osgi/Activator.java
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/service/FriendsGadgetServiceImpl.java
trunk/amdatu-opensocial/examples/gadgetrepository/pom.xml
trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/opensocial/example/gadgetrepository/ExampleGadgetRepositoryService.java
trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/opensocial/example/gadgetrepository/osgi/Activator.java
trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/opensocial/example/gadgetrepository/service/ExampleGadgetRepositoryServiceImpl.java
Modified: trunk/amdatu-opensocial/examples/friends-gadget/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/examples/friends-gadget/pom.xml (original)
+++ trunk/amdatu-opensocial/examples/friends-gadget/pom.xml Mon Aug 8
13:48:31 2011
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial</artifactId>
+ <artifactId>org.amdatu.opensocial.examples</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
<artifactId>org.amdatu.opensocial.example.friends.gadget</artifactId>
Modified:
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/osgi/Activator.java
Mon Aug 8 13:48:31 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.example.friends.gadget.osgi;
+package org.amdatu.opensocial.example.friends.gadget.osgi;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.amdatu.example.friends.gadget.service.FriendsGadgetServiceImpl;
+import
org.amdatu.opensocial.example.friends.gadget.service.FriendsGadgetServiceImpl;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.web.dispatcher.DispatcherService;
import org.amdatu.web.httpcontext.ResourceProvider;
@@ -33,7 +33,7 @@
/**
* This is the OSGi activator for this gadget bundle.
- *
+ *
* @author ivol
*/
public class Activator extends DependencyActivatorBase {
Modified:
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/service/FriendsGadgetServiceImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/service/FriendsGadgetServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/service/FriendsGadgetServiceImpl.java
Mon Aug 8 13:48:31 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.example.friends.gadget.service;
+package org.amdatu.opensocial.example.friends.gadget.service;
import java.net.URL;
-import org.amdatu.example.friends.gadget.osgi.Activator;
-import org.amdatu.example.gadgetrepository.ExampleGadgetRepositoryService;
+import org.amdatu.opensocial.example.friends.gadget.osgi.Activator;
+import
org.amdatu.opensocial.example.gadgetrepository.ExampleGadgetRepositoryService;
import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.web.httpcontext.ResourceProvider;
@@ -28,7 +28,7 @@
/**
* This friends gadget service implements WebResourceProvider to provide the
resources that make up this gadget (like
* the gadget XML).
- *
+ *
* @author ivol
*/
public class FriendsGadgetServiceImpl implements ResourceProvider {
Modified: trunk/amdatu-opensocial/examples/gadgetrepository/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/examples/gadgetrepository/pom.xml (original)
+++ trunk/amdatu-opensocial/examples/gadgetrepository/pom.xml Mon Aug 8
13:48:31 2011
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial</artifactId>
+ <artifactId>org.amdatu.opensocial.examples</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
<artifactId>org.amdatu.opensocial.example.gadget.repository</artifactId>
@@ -32,8 +32,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.example.gadgetrepository.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.example.gadgetrepository</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.opensocial.example.gadgetrepository.osgi.Activator</Bundle-Activator>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified:
trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/opensocial/example/gadgetrepository/ExampleGadgetRepositoryService.java
==============================================================================
---
/trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/example/gadgetrepository/ExampleGadgetRepositoryService.java
(original)
+++
trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/opensocial/example/gadgetrepository/ExampleGadgetRepositoryService.java
Mon Aug 8 13:48:31 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.example.gadgetrepository;
+package org.amdatu.opensocial.example.gadgetrepository;
import org.amdatu.opensocial.gadgetmanagement.GadgetCategory;
Modified:
trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/opensocial/example/gadgetrepository/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/example/gadgetrepository/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/opensocial/example/gadgetrepository/osgi/Activator.java
Mon Aug 8 13:48:31 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.example.gadgetrepository.osgi;
+package org.amdatu.opensocial.example.gadgetrepository.osgi;
-import org.amdatu.example.gadgetrepository.ExampleGadgetRepositoryService;
-import
org.amdatu.example.gadgetrepository.service.ExampleGadgetRepositoryServiceImpl;
+import
org.amdatu.opensocial.example.gadgetrepository.ExampleGadgetRepositoryService;
+import
org.amdatu.opensocial.example.gadgetrepository.service.ExampleGadgetRepositoryServiceImpl;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
@@ -28,7 +28,7 @@
* @author ivol
*/
public class Activator extends DependencyActivatorBase {
-
+
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
manager.add(
Modified:
trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/opensocial/example/gadgetrepository/service/ExampleGadgetRepositoryServiceImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/example/gadgetrepository/service/ExampleGadgetRepositoryServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/examples/gadgetrepository/src/main/java/org/amdatu/opensocial/example/gadgetrepository/service/ExampleGadgetRepositoryServiceImpl.java
Mon Aug 8 13:48:31 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.example.gadgetrepository.service;
+package org.amdatu.opensocial.example.gadgetrepository.service;
-import org.amdatu.example.gadgetrepository.ExampleGadgetRepositoryService;
+import
org.amdatu.opensocial.example.gadgetrepository.ExampleGadgetRepositoryService;
import org.amdatu.opensocial.gadgetmanagement.GadgetCategory;
import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
@@ -24,7 +24,7 @@
/**
* This service provides an example gadget repository. It registers some
example gadgets which
* can be used in the Amdatu OpenSocial container.
- *
+ *
* @author ivol
*/
public class ExampleGadgetRepositoryServiceImpl implements
ExampleGadgetRepositoryService {
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
