Author: ivol37 at gmail.com
Date: Wed Nov 10 14:52:17 2010
New Revision: 354
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/osgi/
- copied from r350,
/trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/osgi/
Removed:
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/osgi/
Modified:
trunk/amdatu-core/config-templates/pom.xml
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/osgi/Activator.java
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/configtemplatemanager/service/ConfigTemplateManagerImpl.java
Modified: trunk/amdatu-core/config-templates/pom.xml
==============================================================================
--- trunk/amdatu-core/config-templates/pom.xml (original)
+++ trunk/amdatu-core/config-templates/pom.xml Wed Nov 10 14:52:17 2010
@@ -46,10 +46,10 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.core.configtemplatemanager.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.configtemplatemanager</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.core.config.templates.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.core.config.templates</Bundle-SymbolicName>
<Export-Package>
- org.amdatu.core.configtemplatemanager
+ org.amdatu.core.config.templates
</Export-Package>
</instructions>
</configuration>
Modified:
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/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/config/templates/osgi/Activator.java
Wed Nov 10 14:52:17 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.osgi;
+package org.amdatu.core.config.templates.osgi;
import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.amdatu.core.configtemplatemanager.service.ConfigTemplateManagerImpl;
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:52:17 2010
@@ -27,7 +27,7 @@
import java.util.regex.Pattern;
import org.amdatu.core.config.templates.ConfigTemplateManager;
-import org.amdatu.core.configtemplatemanager.osgi.Activator;
+import org.amdatu.core.config.templates.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;