Author: ivol37 at gmail.com
Date: Wed Nov 10 14:23:06 2010
New Revision: 343
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/core/
trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/core/onfig/
trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/core/onfig/filebased/
- copied from r331,
/trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/configuration/filebased/
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/ConfigTemplateManager.java
- copied, changed from r331,
/trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/ConfigTemplateManager.java
Removed:
trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/configuration/filebased/
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/ConfigTemplateManager.java
Modified:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/osgi/Activator.java
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/service/CassandraConfigurationServiceImpl.java
trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/core/onfig/filebased/Activator.java
trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/core/onfig/filebased/Configurator.java
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/osgi/Activator.java
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/service/ConfigTemplateManagerImpl.java
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseOntologyDataProvider.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/osgi/Activator.java
Modified:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/osgi/Activator.java
(original)
+++
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/osgi/Activator.java
Wed Nov 10 14:23:06 2010
@@ -20,7 +20,7 @@
import org.amdatu.core.cassandra.application.CassandraDaemonService;
import
org.amdatu.core.cassandra.application.service.CassandraConfigurationServiceImpl;
import
org.amdatu.core.cassandra.application.service.CassandraDaemonServiceImpl;
-import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/service/CassandraConfigurationServiceImpl.java
==============================================================================
---
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/service/CassandraConfigurationServiceImpl.java
(original)
+++
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/service/CassandraConfigurationServiceImpl.java
Wed Nov 10 14:23:06 2010
@@ -22,7 +22,7 @@
import java.util.Dictionary;
import org.amdatu.core.cassandra.application.CassandraConfigurationService;
-import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.apache.log4j.PropertyConfigurator;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/core/onfig/filebased/Activator.java
==============================================================================
---
/trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/configuration/filebased/Activator.java
(original)
+++
trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/core/onfig/filebased/Activator.java
Wed Nov 10 14:23:06 2010
@@ -1,4 +1,4 @@
-package org.amdatu.configuration.filebased;
+package org.amdatu.core.onfig.filebased;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/core/onfig/filebased/Configurator.java
==============================================================================
---
/trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/configuration/filebased/Configurator.java
(original)
+++
trunk/amdatu-core/config-filebased/src/main/java/org/amdatu/core/onfig/filebased/Configurator.java
Wed Nov 10 14:23:06 2010
@@ -1,4 +1,4 @@
-package org.amdatu.configuration.filebased;
+package org.amdatu.core.onfig.filebased;
import java.io.IOException;
import java.io.InputStream;
Copied:
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/ConfigTemplateManager.java
(from r331,
/trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/ConfigTemplateManager.java)
==============================================================================
---
/trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/ConfigTemplateManager.java
(original)
+++
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/ConfigTemplateManager.java
Wed Nov 10 14:23:06 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.configtemplatemanager;
+package org.amdatu.core.config.templates;
import java.io.BufferedWriter;
import java.io.File;
Modified:
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/osgi/Activator.java
(original)
+++
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/osgi/Activator.java
Wed Nov 10 14:23:06 2010
@@ -16,7 +16,7 @@
*/
package org.amdatu.core.configtemplatemanager.osgi;
-import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.amdatu.core.configtemplatemanager.service.ConfigTemplateManagerImpl;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified:
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/service/ConfigTemplateManagerImpl.java
==============================================================================
---
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/service/ConfigTemplateManagerImpl.java
(original)
+++
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/service/ConfigTemplateManagerImpl.java
Wed Nov 10 14:23:06 2010
@@ -26,7 +26,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.amdatu.core.configtemplatemanager.osgi.Activator;
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/CourseOntologyDataProvider.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseOntologyDataProvider.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseOntologyDataProvider.java
Wed Nov 10 14:23:06 2010
@@ -26,7 +26,7 @@
import java.util.Map;
import org.amdatu.example.courseservice.CourseService;
-import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.amdatu.semanticweb.sesame.SPARQLQueryHandler;
import org.amdatu.semanticweb.sesame.SesameService;
import org.openrdf.model.URI;
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 14:23:06 2010
@@ -34,7 +34,7 @@
import org.amdatu.example.courseservice.CourseList;
import org.amdatu.example.courseservice.CourseService;
import org.amdatu.authorization.login.service.LoginService;
-import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.opensocial.profile.PersonService;
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/osgi/Activator.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/osgi/Activator.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/osgi/Activator.java
Wed Nov 10 14:23:06 2010
@@ -21,7 +21,7 @@
import org.amdatu.example.courseservice.impl.CourseResource;
import org.amdatu.example.courseservice.impl.CourseServiceImpl;
import org.amdatu.example.courseservice.impl.ProfileDataProvider;
-import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.opensocial.profile.PersonService;
