Author: matthijsh
Date: Wed Jan 18 09:13:40 2012
New Revision: 1923
Log:
[SANDBOX] Updated implementations
Added:
sandbox/matthijsh/config-templates/processor-base/
sandbox/matthijsh/config-templates/processor-base/pom.xml
sandbox/matthijsh/config-templates/processor-caching/
sandbox/matthijsh/config-templates/processor-caching/pom.xml
sandbox/matthijsh/config-templates/processor-simple/
sandbox/matthijsh/config-templates/processor-simple/pom.xml
sandbox/matthijsh/config-templates/processor-velocity/
sandbox/matthijsh/config-templates/processor-velocity/pom.xml
Modified:
sandbox/matthijsh/config-templates/pom.xml
sandbox/matthijsh/config-templates/src/
Modified: sandbox/matthijsh/config-templates/pom.xml
==============================================================================
--- sandbox/matthijsh/config-templates/pom.xml (original)
+++ sandbox/matthijsh/config-templates/pom.xml Wed Jan 18 09:13:40 2012
@@ -16,38 +16,39 @@
<artifactId>org.amdatu.core</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
- <artifactId>org.amdatu.core.config.templates2</artifactId>
- <packaging>bundle</packaging>
- <name>Amdatu Core - Configuration Templates</name>
+ <artifactId>org.amdatu.core.template.processor</artifactId>
+ <packaging>pom</packaging>
+ <name>Amdatu Core - Template Processor</name>
<description>The template manager can be used to replace configurable
properties in any file with provided configuration properties</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <modules>
+ <module>processor-base</module>
+ <module>processor-simple</module>
+ <module>processor-caching</module>
+ <module>processor-velocity</module>
+ </modules>
-
- <build>
+ <reporting>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.6</version>
<configuration>
- <instructions>
-
<Bundle-Activator>org.amdatu.core.config.templates.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.config.templates2</Bundle-SymbolicName>
- <Export-Package>
-
org.amdatu.core.config.templates;version="2.0.0"
- </Export-Package>
- </instructions>
+ <!-- Aggregation is not yet supported
in 2.6. A highly popular JIRA
+ issue has been created to
resolve this issue: http://jira.codehaus.org/browse/MCHECKSTYLE-62
+ <aggregate>true</aggregate> -->
+
+ <linkXref>true</linkXref>
+
<configLocation>target/amdatu_checks.xml</configLocation>
+
<enableRulesSummary>false</enableRulesSummary>
</configuration>
</plugin>
+ </plugins>
+ </reporting>
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -108,24 +109,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory
- when the deploy profile is activated -->
- <id>deploy</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Added: sandbox/matthijsh/config-templates/processor-base/pom.xml
==============================================================================
--- (empty file)
+++ sandbox/matthijsh/config-templates/processor-base/pom.xml Wed Jan 18
09:13:40 2012
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2010, 2011 The Amdatu Foundation Licensed under the Apache
+ License, Version 2.0
"C:/Users/MATTHI~1/AppData/Local/Temp/7zEB425.tmp/MANIFEST.MF"(the
+ "License"); you may not use this file except in compliance with the
License.
+ You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License
for
+ the specific language governing permissions and limitations under the
License.verning
+ permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.template.processor</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.core.template.processor.base</artifactId>
+ <packaging>jar</packaging>
+ <name>Amdatu Core - Template Processor Base</name>
+ <description>The template manager base</description>
+</project>
Added: sandbox/matthijsh/config-templates/processor-caching/pom.xml
==============================================================================
--- (empty file)
+++ sandbox/matthijsh/config-templates/processor-caching/pom.xml Wed Jan
18 09:13:40 2012
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2010, 2011 The Amdatu Foundation Licensed under the Apache
+ License, Version 2.0
"C:/Users/MATTHI~1/AppData/Local/Temp/7zEB425.tmp/MANIFEST.MF"(the
+ "License"); you may not use this file except in compliance with the
License.
+ You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License
for
+ the specific language governing permissions and limitations under the
License.verning
+ permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.template.processor</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.core.template.processor.caching</artifactId>
+ <packaging>bundle</packaging>
+ <name>Amdatu Core - Caching Template Processor</name>
+ <description>The template manager can be used to replace configurable
properties in any file with provided configuration properties
(caching)</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+
<artifactId>org.amdatu.core.template.processor.simple</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Bundle-Activator>org.amdatu.core.template.processor.caching.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.core.template.processor.caching</Bundle-SymbolicName>
+
<Embed-Dependency>*;scope=compile;inline=true|!org/amdatu/core/template/processor/simple/osgi/**</Embed-Dependency>
+
<Embed-Transitive>true</Embed-Transitive>
+ <Export-Package>
+
org.amdatu.core.template.processor;version="1.0.0"
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory
+ when the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Added: sandbox/matthijsh/config-templates/processor-simple/pom.xml
==============================================================================
--- (empty file)
+++ sandbox/matthijsh/config-templates/processor-simple/pom.xml Wed Jan 18
09:13:40 2012
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2010, 2011 The Amdatu Foundation Licensed under the Apache
+ License, Version 2.0
"C:/Users/MATTHI~1/AppData/Local/Temp/7zEB425.tmp/MANIFEST.MF"(the
+ "License"); you may not use this file except in compliance with the
License.
+ You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License
for
+ the specific language governing permissions and limitations under the
License.verning
+ permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.template.processor</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.core.template.processor.simple</artifactId>
+ <packaging>bundle</packaging>
+ <name>Amdatu Core - Simple Template Processor</name>
+ <description>The template manager can be used to replace configurable
properties in any file with provided configuration properties
(simple)</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+
<artifactId>org.amdatu.core.template.processor.base</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Bundle-Activator>org.amdatu.core.template.processor.simple.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.core.template.processor.simple</Bundle-SymbolicName>
+
<Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+
<Embed-Transitive>true</Embed-Transitive>
+ <Export-Package>
+
org.amdatu.core.template.processor;version="1.0.0"
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory
+ when the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Added: sandbox/matthijsh/config-templates/processor-velocity/pom.xml
==============================================================================
--- (empty file)
+++ sandbox/matthijsh/config-templates/processor-velocity/pom.xml Wed Jan
18 09:13:40 2012
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2010, 2011 The Amdatu Foundation Licensed under the Apache
License,
+ Version 2.0
"C:/Users/MATTHI~1/AppData/Local/Temp/7zEB425.tmp/MANIFEST.MF"(the "License");
+ you may not use this file except in compliance with the License. You may
obtain a
+ copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
+ by applicable law or agreed to in writing, software distributed under the
License
+ is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND,
+ either express or implied. See the License for the specific language
governing permissions
+ and limitations under the License.verning permissions and limitations under
the License. -->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.template.processor</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.core.template.processor.velocity</artifactId>
+ <packaging>bundle</packaging>
+ <name>Amdatu Core - Velocity Template Processor</name>
+ <description>The template manager can be used to replace configurable
properties in any file with provided configuration properties
(velocity)</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.template.processor.base</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <!--
commons-collections,commons-lang,velocity;inline=org/apache/velocity/Template.class|org/apache/velocity/VelocityContext.class|org/apache/velocity/app/**|org/apache/velocity/context/**|org/apache/velocity/convert/**|org/apache/velocity/exception/**|org/apache/velocity/io/**|org/apache/velocity/runtime/**|org/apache/velocity/texen/**|org/apache/velocity/util/**
-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Bundle-Activator>org.amdatu.core.template.processor.velocity.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.core.template.processor.velocity</Bundle-SymbolicName>
+ <Embed-Dependency>
+ velocity,commons-collections,commons-lang;scope=compile
+ </Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Export-Package>
+ org.amdatu.core.template.processor.velocity;version="1.0.0"
+ </Export-Package>
+ <Import-Package>
+ <!-- !org.jdom, !com.werken.xpath, !org.xml.sax,
!org.apache.commons.logging,
+ !org.apache.log, !org.apache.log.format,
!org.apache.log.output.io, !org.apache.log4j,
+ !org.apache.oro.text.perl, !org.apache.tools.ant, -->
+
+ !org.jdom,
+ !org.jdom.input,
+ !org.xml.sax,
+ !com.werken.xpath,
+ !javax.naming,
+ !javax.servlet,
+ !javax.servlet.http,
+ !javax.sql,
+ !org.apache.commons.logging,
+ !org.apache.log,
+ !org.apache.log.format,
+ !org.apache.log.output.io,
+ !org.apache.log4j,
+ !org.apache.oro.text.perl,
+ !org.apache.tools.ant,
+ !org.apache.tools.ant.taskdefs,
+ !org.jdom.output,
+
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory
+ when the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
