Author: ivol37 at gmail.com
Date: Tue Nov 9 15:31:18 2010
New Revision: 278
Log:
[AMDATU-129] Refactoring/moving for opensocial and semantic web modules part 3
Added:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetCategory.java
- copied, changed from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetCategory.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetDefinition.java
- copied, changed from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetDefinition.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
- copied, changed from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetStore.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OAuthModule.java
- copied, changed from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OAuthModule.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OpenSocialConstants.java
- copied, changed from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OpenSocialConstants.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/SocialApiModule.java
- copied, changed from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/SocialApiModule.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/
- copied from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/oauth/
- copied from r277,
/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 r277,
/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 r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/
- copied from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/SPARQLQueryHandler.java
- copied, changed from r276,
/trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/SPARQLQueryHandler.java
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/SesameService.java
- copied, changed from r276,
/trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/SesameService.java
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/osgi/
- copied from r276,
/trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/osgi/
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/service/
- copied from r276,
/trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/service/
Removed:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetCategory.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetDefinition.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetStore.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OAuthModule.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OpenSocialConstants.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/SocialApiModule.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/
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/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/SPARQLQueryHandler.java
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/SesameService.java
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/osgi/
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/service/
Modified:
trunk/amdatu-opensocial/shindig-application/pom.xml
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/ConfigurationAdminGuiceModule.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/OAuthModuleImpl.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/SocialApiModuleImpl.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
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/EchoServlet.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorService.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServiceImpl.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServlet.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/PersonServiceDispatcher.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
trunk/amdatu-semanticweb/sesame-application/pom.xml
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/osgi/Activator.java
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/service/SesameServiceImpl.java
trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/GadgetManagement.java
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/osgi/Activator.java
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/service/GadgetManagementServiceImpl.java
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/service/CourseGadgetServiceImpl.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseOntologyDataProvider.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseServiceImpl.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/service/FriendsGadgetServiceImpl.java
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/service/LoginServiceImpl.java
trunk/src/main/resources/conf/felix-config.properties
Modified: trunk/amdatu-opensocial/shindig-application/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/shindig-application/pom.xml (original)
+++ trunk/amdatu-opensocial/shindig-application/pom.xml Tue Nov 9 15:31:18 2010
@@ -167,7 +167,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.opensocial.shindig.application.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.opensocial.shindig.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.platform.shindig</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
@@ -176,7 +176,7 @@
</Import-Package>
<_exportcontents>
org.apache.shindig.*,
- org.amdatu.opensocial.shindig.application,
+ org.amdatu.opensocial.shindig,
com.google.inject.internal.*,
net.oauth.*
</_exportcontents>
Copied:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetCategory.java
(from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetCategory.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetCategory.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetCategory.java
Tue Nov 9 15:31:18 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;
+package org.amdatu.opensocial.shindig;
/**
* Represents a gadget category.
Copied:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetDefinition.java
(from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetDefinition.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetDefinition.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetDefinition.java
Tue Nov 9 15:31:18 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;
+package org.amdatu.opensocial.shindig;
public class GadgetDefinition implements Comparable<GadgetDefinition>{
// Attributes
Copied:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
(from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetStore.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetStore.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
Tue Nov 9 15:31:18 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;
+package org.amdatu.opensocial.shindig;
import java.util.Map;
Copied:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OAuthModule.java
(from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OAuthModule.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OAuthModule.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OAuthModule.java
Tue Nov 9 15:31:18 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;
+package org.amdatu.opensocial.shindig;
import com.google.inject.Module;
Copied:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OpenSocialConstants.java
(from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OpenSocialConstants.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OpenSocialConstants.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OpenSocialConstants.java
Tue Nov 9 15:31:18 2010
@@ -14,13 +14,13 @@
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;
+package org.amdatu.opensocial.shindig;
public interface OpenSocialConstants {
/**
* Key under which the AppData are stored in the properties of the user
using UserAdmin.
*/
- final String APP_DATA =
"org.amdatu.opensocial.shindig.application.persistence.appdata";
+ final String APP_DATA =
"org.amdatu.opensocial.shindig.persistence.appdata";
/**
* Name of the property in AppData used to store registered gadgets
(gadgets to display in
Copied:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/SocialApiModule.java
(from r277,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/SocialApiModule.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/SocialApiModule.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/SocialApiModule.java
Tue Nov 9 15:31:18 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;
+package org.amdatu.opensocial.shindig;
import com.google.inject.Module;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/ConfigurationAdminGuiceModule.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/ConfigurationAdminGuiceModule.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/ConfigurationAdminGuiceModule.java
Tue Nov 9 15:31:18 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.module;
+package org.amdatu.opensocial.shindig.module;
import java.util.Dictionary;
import java.util.Enumeration;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/OAuthModuleImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/OAuthModuleImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/OAuthModuleImpl.java
Tue Nov 9 15:31:18 2010
@@ -14,13 +14,13 @@
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.module;
+package org.amdatu.opensocial.shindig.module;
import java.io.File;
import java.io.IOException;
import java.util.logging.Logger;
-import org.amdatu.opensocial.shindig.application.OAuthModule;
+import org.amdatu.opensocial.shindig.OAuthModule;
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.crypto.BasicBlobCrypter;
import org.apache.shindig.common.crypto.BlobCrypter;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/SocialApiModuleImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/SocialApiModuleImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/SocialApiModuleImpl.java
Tue Nov 9 15:31:18 2010
@@ -14,13 +14,13 @@
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.module;
+package org.amdatu.opensocial.shindig.module;
import java.util.List;
import java.util.Set;
-import org.amdatu.opensocial.shindig.application.SocialApiModule;
-import
org.amdatu.opensocial.shindig.application.service.PersonServiceDispatcher;
+import org.amdatu.opensocial.shindig.SocialApiModule;
+import org.amdatu.opensocial.shindig.service.PersonServiceDispatcher;
import org.apache.shindig.auth.AnonymousAuthenticationHandler;
import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.common.servlet.ParameterFetcher;
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
Tue Nov 9 15:31:18 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
Tue Nov 9 15:31:18 2010
@@ -14,26 +14,26 @@
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.platform.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.GadgetStore;
-import org.amdatu.opensocial.shindig.application.OAuthModule;
-import org.amdatu.opensocial.shindig.application.SocialApiModule;
-import
org.amdatu.opensocial.shindig.application.module.ConfigurationAdminGuiceModule;
-import org.amdatu.opensocial.shindig.application.module.OAuthModuleImpl;
-import org.amdatu.opensocial.shindig.application.module.SocialApiModuleImpl;
-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.GadgetStore;
+import org.amdatu.opensocial.shindig.OAuthModule;
+import org.amdatu.opensocial.shindig.SocialApiModule;
+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.amdatu.opensocial.shindig.service.GuiceInjectorService;
+import org.amdatu.opensocial.shindig.service.GuiceInjectorServiceImpl;
+import org.amdatu.opensocial.shindig.service.ShindigRegistrationServiceImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.apache.shindig.gadgets.oauth.OAuthStore;
@@ -54,7 +54,7 @@
public final static String RESOURCE_ID = "gadgets";
// The PID for Shindig specific configuration properties
- public final static String SHINDIG_CONFIG_PID =
"org.amdatu.opensocial.shindig.application";
+ public final static String SHINDIG_CONFIG_PID =
"org.amdatu.opensocial.shindig";
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
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
Tue Nov 9 15:31:18 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;
@@ -25,7 +25,7 @@
import com.google.common.collect.Maps;
import org.amdatu.libraries.utilities.ConversionUtil;
-import org.amdatu.opensocial.shindig.application.OpenSocialConstants;
+import org.amdatu.opensocial.shindig.OpenSocialConstants;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.protocol.DataCollection;
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
Tue Nov 9 15:31:18 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;
@@ -23,8 +23,8 @@
import net.oauth.OAuthConsumer;
import net.oauth.OAuthServiceProvider;
import net.oauth.signature.RSA_SHA1;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
-import org.amdatu.opensocial.shindig.application.GadgetStore;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetStore;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.oauth.*;
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
Tue Nov 9 15:31:18 2010
@@ -14,14 +14,14 @@
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.platform.cassandra.listener.ColumnFamilyDefinition;
import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType;
import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType;
import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.opensocial.shindig.application.GadgetStore;
+import org.amdatu.opensocial.shindig.GadgetStore;
/**
* This service only provides the Role Column Family. Note that the
CassandraStorageProvider has
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
Tue Nov 9 15:31:18 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;
@@ -28,9 +28,9 @@
import org.amdatu.platform.cassandra.persistencemanager.CassandraException;
import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
-import org.amdatu.opensocial.shindig.application.GadgetStore;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetStore;
import org.apache.commons.io.IOUtils;
import org.apache.shindig.gadgets.oauth.BasicOAuthStore;
import org.apache.shindig.gadgets.oauth.BasicOAuthStoreConsumerKeyAndSecret;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/EchoServlet.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/EchoServlet.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/EchoServlet.java
Tue Nov 9 15:31:18 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.service;
+package org.amdatu.opensocial.shindig.service;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorService.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorService.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorService.java
Tue Nov 9 15:31:18 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.service;
+package org.amdatu.opensocial.shindig.service;
import javax.servlet.Servlet;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServiceImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServiceImpl.java
Tue Nov 9 15:31:18 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.service;
+package org.amdatu.opensocial.shindig.service;
import java.io.IOException;
import java.util.ArrayList;
@@ -29,9 +29,9 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
-import org.amdatu.opensocial.shindig.application.OAuthModule;
-import org.amdatu.opensocial.shindig.application.SocialApiModule;
-import
org.amdatu.opensocial.shindig.application.module.ConfigurationAdminGuiceModule;
+import org.amdatu.opensocial.shindig.OAuthModule;
+import org.amdatu.opensocial.shindig.SocialApiModule;
+import org.amdatu.opensocial.shindig.module.ConfigurationAdminGuiceModule;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.apache.shindig.common.servlet.GuiceServletContextListener;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServlet.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorServlet.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServlet.java
Tue Nov 9 15:31:18 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.service;
+package org.amdatu.opensocial.shindig.service;
/**
* This interface enables dependencies on the availability of the Guice
injector servlet using service dependencies.
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/PersonServiceDispatcher.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/PersonServiceDispatcher.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/PersonServiceDispatcher.java
Tue Nov 9 15:31:18 2010
@@ -15,7 +15,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.service;
+package org.amdatu.opensocial.shindig.service;
import java.util.Set;
import java.util.concurrent.ExecutionException;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/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/service/ShindigRegistrationServiceImpl.java
Tue Nov 9 15:31:18 2010
@@ -14,9 +14,9 @@
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.service;
+package org.amdatu.opensocial.shindig.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-semanticweb/sesame-application/pom.xml
==============================================================================
--- trunk/amdatu-semanticweb/sesame-application/pom.xml (original)
+++ trunk/amdatu-semanticweb/sesame-application/pom.xml Tue Nov 9 15:31:18 2010
@@ -41,7 +41,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.semanticweb.sesame.application.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.semanticweb.sesame.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.semanticweb.sesame</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
@@ -49,7 +49,7 @@
*;resolution:=optional
</Import-Package>
<_exportcontents>
- org.amdatu.semanticweb.sesame.application,
+ org.amdatu.semanticweb.sesame,
org.openrdf.*
</_exportcontents>
</instructions>
Copied:
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/SPARQLQueryHandler.java
(from r276,
/trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/SPARQLQueryHandler.java)
==============================================================================
---
/trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/SPARQLQueryHandler.java
(original)
+++
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/SPARQLQueryHandler.java
Tue Nov 9 15:31:18 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.semanticweb.sesame.application;
+package org.amdatu.semanticweb.sesame;
import org.openrdf.query.TupleQueryResult;
Copied:
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/SesameService.java
(from r276,
/trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/SesameService.java)
==============================================================================
---
/trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/SesameService.java
(original)
+++
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/SesameService.java
Tue Nov 9 15:31:18 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.semanticweb.sesame.application;
+package org.amdatu.semanticweb.sesame;
import java.net.URL;
import java.util.List;
Modified:
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/osgi/Activator.java
(original)
+++
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/osgi/Activator.java
Tue Nov 9 15:31:18 2010
@@ -14,10 +14,10 @@
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.semanticweb.sesame.application.osgi;
+package org.amdatu.semanticweb.sesame.osgi;
-import org.amdatu.semanticweb.sesame.application.SesameService;
-import org.amdatu.semanticweb.sesame.application.service.SesameServiceImpl;
+import org.amdatu.semanticweb.sesame.SesameService;
+import org.amdatu.semanticweb.sesame.service.SesameServiceImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/service/SesameServiceImpl.java
==============================================================================
---
/trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/application/service/SesameServiceImpl.java
(original)
+++
trunk/amdatu-semanticweb/sesame-application/src/main/java/org/amdatu/semanticweb/sesame/service/SesameServiceImpl.java
Tue Nov 9 15:31:18 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.semanticweb.sesame.application.service;
+package org.amdatu.semanticweb.sesame.service;
import java.io.File;
import java.io.IOException;
@@ -22,8 +22,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.amdatu.semanticweb.sesame.application.SPARQLQueryHandler;
-import org.amdatu.semanticweb.sesame.application.SesameService;
+import org.amdatu.semanticweb.sesame.SPARQLQueryHandler;
+import org.amdatu.semanticweb.sesame.SesameService;
import org.openrdf.model.URI;
import org.openrdf.model.ValueFactory;
import org.openrdf.query.*;
Modified: trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml
==============================================================================
--- trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml (original)
+++ trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml Tue Nov 9
15:31:18 2010
@@ -59,8 +59,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.gadget.sparqlendpoint.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.gadget.sparqlendpoint</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.semanticweb.sparqlendpoint.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.semanticweb.sparqlendpoint</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
Modified:
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
==============================================================================
---
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
(original)
+++
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
Tue Nov 9 15:31:18 2010
@@ -20,7 +20,7 @@
import org.amdatu.semanticweb.sparqlendpoint.service.SPARQLEndpointServiceImpl;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.semanticweb.sesame.application.SesameService;
+import org.amdatu.semanticweb.sesame.SesameService;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
==============================================================================
---
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
(original)
+++
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
Tue Nov 9 15:31:18 2010
@@ -27,10 +27,10 @@
import org.amdatu.semanticweb.sparqlendpoint.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.semanticweb.sesame.application.SPARQLQueryHandler;
-import org.amdatu.semanticweb.sesame.application.SesameService;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
+import org.amdatu.semanticweb.sesame.SPARQLQueryHandler;
+import org.amdatu.semanticweb.sesame.SesameService;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.apache.felix.dm.Component;
import org.json.JSONException;
import org.json.JSONObject;
Modified:
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/GadgetManagement.java
==============================================================================
---
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/GadgetManagement.java
(original)
+++
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/GadgetManagement.java
Tue Nov 9 15:31:18 2010
@@ -16,8 +16,8 @@
*/
package org.amdatu.application.gadgetmanagement;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
/**
* This service provides CRUD operations on all gadgets definitions available
in the gadget store. The gadget
Modified:
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/osgi/Activator.java
==============================================================================
---
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/osgi/Activator.java
(original)
+++
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/osgi/Activator.java
Tue Nov 9 15:31:18 2010
@@ -22,7 +22,7 @@
import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.GadgetStore;
+import org.amdatu.opensocial.shindig.GadgetStore;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
---
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/service/GadgetManagementServiceImpl.java
Tue Nov 9 15:31:18 2010
@@ -50,10 +50,10 @@
import org.amdatu.web.httpcontext.BasicHttpSession;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
-import org.amdatu.opensocial.shindig.application.GadgetStore;
-import org.amdatu.opensocial.shindig.application.OpenSocialConstants;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetStore;
+import org.amdatu.opensocial.shindig.OpenSocialConstants;
import org.apache.felix.dm.Component;
import org.apache.shindig.auth.BlobCrypterSecurityToken;
import org.apache.shindig.common.crypto.BasicBlobCrypter;
Modified:
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/service/CourseGadgetServiceImpl.java
==============================================================================
---
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/service/CourseGadgetServiceImpl.java
(original)
+++
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/service/CourseGadgetServiceImpl.java
Tue Nov 9 15:31:18 2010
@@ -23,8 +23,8 @@
import org.amdatu.example.course.gadget.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationException;
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseOntologyDataProvider.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseOntologyDataProvider.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseOntologyDataProvider.java
Tue Nov 9 15:31:18 2010
@@ -27,8 +27,8 @@
import org.amdatu.example.course.service.CourseService;
import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
-import org.amdatu.semanticweb.sesame.application.SPARQLQueryHandler;
-import org.amdatu.semanticweb.sesame.application.SesameService;
+import org.amdatu.semanticweb.sesame.SPARQLQueryHandler;
+import org.amdatu.semanticweb.sesame.SesameService;
import org.openrdf.model.URI;
import org.openrdf.model.ValueFactory;
import org.openrdf.model.impl.URIImpl;
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseServiceImpl.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseServiceImpl.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseServiceImpl.java
Tue Nov 9 15:31:18 2010
@@ -22,8 +22,8 @@
import org.amdatu.example.course.service.Course;
import org.amdatu.example.course.service.CourseService;
-import org.amdatu.semanticweb.sesame.application.SPARQLQueryHandler;
-import org.amdatu.semanticweb.sesame.application.SesameService;
+import org.amdatu.semanticweb.sesame.SPARQLQueryHandler;
+import org.amdatu.semanticweb.sesame.SesameService;
import org.apache.shindig.social.opensocial.model.Person;
import org.openrdf.query.BindingSet;
import org.openrdf.query.QueryEvaluationException;
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
Tue Nov 9 15:31:18 2010
@@ -25,7 +25,7 @@
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.profile.PersonService;
-import org.amdatu.semanticweb.sesame.application.SesameService;
+import org.amdatu.semanticweb.sesame.SesameService;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/service/FriendsGadgetServiceImpl.java
==============================================================================
---
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/service/FriendsGadgetServiceImpl.java
(original)
+++
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/service/FriendsGadgetServiceImpl.java
Tue Nov 9 15:31:18 2010
@@ -25,8 +25,8 @@
import org.amdatu.example.friends.gadget.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationException;
Modified:
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/service/LoginServiceImpl.java
==============================================================================
---
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/service/LoginServiceImpl.java
(original)
+++
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/service/LoginServiceImpl.java
Tue Nov 9 15:31:18 2010
@@ -23,8 +23,8 @@
import org.amdatu.gadget.login.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationException;
Modified: trunk/src/main/resources/conf/felix-config.properties
==============================================================================
--- trunk/src/main/resources/conf/felix-config.properties (original)
+++ trunk/src/main/resources/conf/felix-config.properties Tue Nov 9
15:31:18 2010
@@ -78,9 +78,9 @@
# may be specified for different start levels.
felix.auto.start.1=reference:file:system-bundles/org.apache.felix.configadmin-1.2.4.jar
reference:file:system-bundles/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
reference:file:system-bundles/org.apache.felix.eventadmin-1.2.2.jar
reference:file:system-bundles/org.apache.felix.fileinstall-3.0.0.jar
reference:file:system-bundles/org.apache.felix.log-1.0.0.jar
reference:file:system-bundles/org.apache.felix.main-2.0.5.jar
reference:file:system-bundles/org.apache.felix.metatype-1.0.4.jar
reference:file:system-bundles/org.apache.felix.shell.tui-1.4.1.jar
reference:file:system-bundles/org.apache.felix.shell-1.4.2.jar
reference:file:system-bundles/org.apache.felix.webconsole-3.1.2.jar
reference:file:system-bundles/org.apache.sling.commons.mime-2.1.4.jar
reference:file:system-bundles/org.apache.sling.commons.osgi-2.0.6.jar
reference:file:system-bundles/org.osgi.compendium-1.0.0.jar
reference:file:system-bundles/org.osgi.core-1.0.0.jar
reference:file:system-bundles/pax-useradmin-service-0.0.1-SNAPSHOT.jar
reference:file:system-bundles/org.apache.felix.http.bundle-${org.apache.felix.http.version}.jar
reference:file:system-bundles/pax-swissbox-core-${pax.swissbox.version}.jar
reference:file:system-bundles/ops4j-base-lang-1.2.2.jar
reference:file:system-bundles/org.apache.felix.scr-1.6.0.jar
felix.auto.start.2=reference:file:platform-bundles/org.amdatu.platform.filebased-configuration-${platform.version}.jar
-felix.auto.start.5=reference:file:platform-bundles/org.amdatu.platform.shindig-application-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-application-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-listener-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-persistencemanager-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.loghandler-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.profile-service-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.tenant-service-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.authorization-${platform.version}.jar
reference:file:application-bundles/org.amdatu.web.httpcontext-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.wink-application-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.sesame-application-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.config-template-manager-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.useradmin-cassandra-store-${platform.version}.jar
+felix.auto.start.5=reference:file:application-bundles/org.amdatu.opensocial.shindig-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-application-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-listener-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-persistencemanager-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.loghandler-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.profile-service-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.tenant-service-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.authorization-${platform.version}.jar
reference:file:application-bundles/org.amdatu.web.httpcontext-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.wink-application-${platform.version}.jar
reference:file:application-bundles/org.amdatu.semanticweb.sesame-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.config-template-manager-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.useradmin-cassandra-store-${platform.version}.jar
felix.auto.start.10=reference:file:application-bundles/org.amdatu.application.dashboard-${platform.version}.jar
reference:file:application-bundles/org.amdatu.application.gadgetmanagement-${platform.version}.jar
reference:file:application-bundles/org.amdatu.web.jsp-${platform.version}.jar
-felix.auto.start.20=reference:file:gadget-bundles/org.amdatu.gadget.sparqlendpoint-${platform.version}.jar
reference:file:gadget-bundles/org.amdatu.gadget.login-${platform.version}.jar
+felix.auto.start.20=reference:file:application-bundles/org.amdatu.semanticweb.sparqlendpoint-${platform.version}.jar
reference:file:gadget-bundles/org.amdatu.gadget.login-${platform.version}.jar
felix.auto.start.30=reference:file:example-bundles/org.amdatu.example.friends-gadget-${platform.version}.jar
reference:file:example-bundles/org.amdatu.example.course-gadget-${platform.version}.jar
reference:file:example-bundles/org.amdatu.example.course-service-${platform.version}.jar
# Sets the initial start level of the framework upon startup.
