Author: ivol37 at gmail.com
Date: Wed Nov 10 11:52:30 2010
New Revision: 332
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/login/
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/login/gadget/
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/login/gadget/osgi/
- copied from r325,
/trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/login/gadget/osgi/Activator.java
- copied, changed from r327,
/trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/login/gadget/service/
- copied from r325,
/trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/service/
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginGadgetImpl.java
- copied, changed from r326,
/trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/service/LoginGadgetImpl.java
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/login/
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/login/service/
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/login/service/LoginService.java
- copied, changed from r327,
/trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/LoginService.java
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/osgi/
- copied from r330,
/trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/core/wink/osgi/
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/
- copied from r330,
/trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/core/wink/service/
Removed:
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginServiceImpl.java
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/LoginService.java
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/core/wink/osgi/
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/core/wink/service/
Modified:
trunk/amdatu-authorization/loginservice/pom.xml
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/service/LoginServiceImpl.java
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/ProfileDataProvider.java
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/osgi/Activator.java
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRestServlet.java
trunk/src/main/resources/conf/felix-config.properties
Copied:
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/login/gadget/osgi/Activator.java
(from r327,
/trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java)
==============================================================================
---
/trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
(original)
+++
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/login/gadget/osgi/Activator.java
Wed Nov 10 11:52:30 2010
@@ -14,11 +14,11 @@
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.authorization.logingadget.osgi;
+package org.amdatu.authorization.login.gadget.osgi;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
-import org.amdatu.authorization.logingadget.service.LoginGadgetImpl;
-import org.amdatu.authorization.loginservice.LoginService;
+import org.amdatu.authorization.login.gadget.service.LoginGadgetImpl;
+import org.amdatu.authorization.login.service.LoginService;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
Copied:
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginGadgetImpl.java
(from r326,
/trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/service/LoginGadgetImpl.java)
==============================================================================
---
/trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/service/LoginGadgetImpl.java
(original)
+++
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginGadgetImpl.java
Wed Nov 10 11:52:30 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.authorization.logingadget.service;
+package org.amdatu.authorization.login.gadget.service;
import java.net.URL;
import java.util.Dictionary;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
-import org.amdatu.authorization.logingadget.osgi.Activator;
+import org.amdatu.authorization.login.gadget.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.opensocial.shindig.GadgetCategory;
Modified: trunk/amdatu-authorization/loginservice/pom.xml
==============================================================================
--- trunk/amdatu-authorization/loginservice/pom.xml (original)
+++ trunk/amdatu-authorization/loginservice/pom.xml Wed Nov 10 11:52:30 2010
@@ -22,9 +22,10 @@
</dependency>
<dependency>
<groupId>org.amdatu.web.rest</groupId>
- <artifactId>wink</artifactId>
- <scope>provided</scope>
+ <artifactId>jaxrs</artifactId>
+ <version>${platform.version}</version>
<type>bundle</type>
+ <scope>provided</scope>
</dependency>
</dependencies>
Copied:
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/login/service/LoginService.java
(from r327,
/trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/LoginService.java)
==============================================================================
---
/trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/LoginService.java
(original)
+++
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/login/service/LoginService.java
Wed Nov 10 11:52:30 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.authorization.loginservice;
+package org.amdatu.authorization.login.service;
/**
Modified:
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
==============================================================================
---
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
(original)
+++
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
Wed Nov 10 11:52:30 2010
@@ -16,7 +16,7 @@
*/
package org.amdatu.authorization.loginservice.osgi;
-import org.amdatu.authorization.loginservice.LoginService;
+import org.amdatu.authorization.login.service.LoginService;
import org.amdatu.authorization.loginservice.service.LoginServiceImpl;
import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
Modified:
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/service/LoginServiceImpl.java
==============================================================================
---
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/service/LoginServiceImpl.java
(original)
+++
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/service/LoginServiceImpl.java
Wed Nov 10 11:52:30 2010
@@ -23,7 +23,7 @@
import javax.ws.rs.core.Response;
import java.net.URL;
-import org.amdatu.authorization.loginservice.LoginService;
+import org.amdatu.authorization.login.service.LoginService;
import org.amdatu.authorization.loginservice.osgi.Activator;
import org.amdatu.web.httpcontext.BasicHttpSession;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
Wed Nov 10 11:52:30 2010
@@ -33,7 +33,7 @@
import org.amdatu.example.courseservice.Course;
import org.amdatu.example.courseservice.CourseList;
import org.amdatu.example.courseservice.CourseService;
-import org.amdatu.authorization.loginservice.LoginService;
+import org.amdatu.authorization.login.service.LoginService;
import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/ProfileDataProvider.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/ProfileDataProvider.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/ProfileDataProvider.java
Wed Nov 10 11:52:30 2010
@@ -16,7 +16,7 @@
*/
package org.amdatu.example.courseservice.impl;
-import org.amdatu.authorization.loginservice.LoginService;
+import org.amdatu.authorization.login.service.LoginService;
import org.amdatu.opensocial.profile.PersonService;
import org.amdatu.opensocial.profile.SerializablePersonImpl;
import org.apache.shindig.social.core.model.NameImpl;
Modified:
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Wed Nov 10 11:52:30 2010
@@ -45,7 +45,7 @@
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.opensocial.gadgetmanagement.osgi.Activator;
import org.amdatu.libraries.utilities.ConversionUtil;
-import org.amdatu.authorization.loginservice.LoginService;
+import org.amdatu.authorization.login.service.LoginService;
import org.amdatu.core.cassandra.persistencemanager.CassandraException;
import org.amdatu.web.httpcontext.BasicHttpSession;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
Modified:
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
Wed Nov 10 11:52:30 2010
@@ -22,7 +22,7 @@
import java.util.Set;
import java.util.concurrent.Future;
-import org.amdatu.authorization.loginservice.LoginService;
+import org.amdatu.authorization.login.service.LoginService;
import org.amdatu.opensocial.profile.PersonService;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
Modified:
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/core/wink/osgi/Activator.java
(original)
+++
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/osgi/Activator.java
Wed Nov 10 11:52:30 2010
@@ -15,10 +15,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.core.wink.osgi;
+package org.amdatu.web.rest.wink.osgi;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
-import org.amdatu.core.wink.service.WinkRegistrationServiceImpl;
+import org.amdatu.web.rest.wink.service.WinkRegistrationServiceImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
==============================================================================
---
/trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/core/wink/service/WinkRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
Wed Nov 10 11:52:30 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.core.wink.service;
+package org.amdatu.web.rest.wink.service;
-import static org.amdatu.core.wink.osgi.Activator.RESOURCE_ID;
+import static org.amdatu.web.rest.wink.osgi.Activator.RESOURCE_ID;
import java.net.URL;
import java.util.ArrayList;
Modified:
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRestServlet.java
==============================================================================
---
/trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/core/wink/service/WinkRestServlet.java
(original)
+++
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRestServlet.java
Wed Nov 10 11:52:30 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.core.wink.service;
+package org.amdatu.web.rest.wink.service;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
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 Wed Nov 10
11:52:30 2010
@@ -77,7 +77,7 @@
# component is the target start level. Any number of these properties
# may be specified for different start levels.
felix.auto.start.1=reference:file:amdatu-system/org.apache.felix.configadmin-1.2.4.jar
reference:file:amdatu-system/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
reference:file:amdatu-system/org.apache.felix.eventadmin-1.2.2.jar
reference:file:amdatu-system/org.apache.felix.fileinstall-3.0.0.jar
reference:file:amdatu-system/org.apache.felix.log-1.0.0.jar
reference:file:amdatu-system/org.apache.felix.main-2.0.5.jar
reference:file:amdatu-system/org.apache.felix.metatype-1.0.4.jar
reference:file:amdatu-system/org.apache.felix.shell.tui-1.4.1.jar
reference:file:amdatu-system/org.apache.felix.shell-1.4.2.jar
reference:file:amdatu-system/org.apache.felix.webconsole-3.1.2.jar
reference:file:amdatu-system/org.apache.sling.commons.mime-2.1.4.jar
reference:file:amdatu-system/org.apache.sling.commons.osgi-2.0.6.jar
reference:file:amdatu-system/org.osgi.compendium-1.0.0.jar
reference:file:amdatu-system/org.osgi.core-1.0.0.jar
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar
reference:file:amdatu-system/org.apache.felix.http.bundle-${org.apache.felix.http.version}.jar
reference:file:amdatu-system/pax-swissbox-core-${pax.swissbox.version}.jar
reference:file:amdatu-system/ops4j-base-lang-1.2.2.jar
reference:file:amdatu-system/org.apache.felix.scr-1.6.0.jar
-felix.auto.start.2=reference:file:amdatu-core/org.amdatu.core.filebased-configuration-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-application-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-listener-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-persistencemanager-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.loghandler-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.tenant-service-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.config-template-manager-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.useradmin-cassandra-store-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.wink-application-${platform.version}.jar
+felix.auto.start.2=reference:file:amdatu-core/org.amdatu.core.config.filebased-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-application-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-listener-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-persistencemanager-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.loghandler-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.tenant-service-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.config.templates-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.useradmin-cassandra-store-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.wink-application-${platform.version}.jar
felix.auto.start.10=reference:file:amdatu-application/org.amdatu.opensocial.shindig-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.opensocial.profile-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.authorization.loginservice-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.web.httpcontext-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.semanticweb.sesame-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.opensocial.dashboard-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.opensocial.gadgetmanagement-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.web.jsp-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.semanticweb.sparqlendpoint-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.authorization.logingadget-${platform.version}.jar
felix.auto.start.20=reference:file:amdatu-examples/org.amdatu.example.friendsgadget-${platform.version}.jar
reference:file:amdatu-examples/org.amdatu.example.coursegadget-${platform.version}.jar
reference:file:amdatu-examples/org.amdatu.example.courseservice-${platform.version}.jar
