http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-local/pom.xml ---------------------------------------------------------------------- diff --git a/samoa-local/pom.xml b/samoa-local/pom.xml index b36a2c8..5a0606a 100644 --- a/samoa-local/pom.xml +++ b/samoa-local/pom.xml @@ -1,101 +1,88 @@ -<!-- - #%L - SAMOA - %% - Copyright (C) 2013 Yahoo! Inc. - %% - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (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. #L% --> +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> - http://www.apache.org/licenses/LICENSE-2.0 + <name>samoa-local</name> + <description>Simple local engine for SAMOA</description> + <artifactId>samoa-local</artifactId> + <parent> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa</artifactId> + <version>0.3.0-SNAPSHOT</version> + </parent> - 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. - #L% - --> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + <dependencies> + <dependency> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa-test</artifactId> + <type>test-jar</type> + <classifier>test-jar-with-dependencies</classifier> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j-simple.version}</version> + </dependency> + </dependencies> - <name>samoa-local</name> - <description>Simple local engine for SAMOA</description> - <artifactId>samoa-local</artifactId> - <parent> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa</artifactId> - <version>0.3.0-SNAPSHOT</version> - </parent> - - <dependencies> - <dependency> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa-test</artifactId> - <type>test-jar</type> - <classifier>test-jar-with-dependencies</classifier> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${slf4j-simple.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <!-- SAMOA assembly --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <configuration> - <finalName>SAMOA-Local-${project.version}</finalName> - <appendAssemblyId>false</appendAssemblyId> - <attach>false</attach> - <outputDirectory>../target</outputDirectory> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifestEntries> - <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> - <Bundle-Description>${project.description}</Bundle-Description> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>Yahoo Labs</Implementation-Vendor> - <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id> - </manifestEntries> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> <!-- this is used for inheritance merges --> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> - <configuration> - <argLine>-Xmx1G</argLine> - <redirectTestOutputToFile>false</redirectTestOutputToFile> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <!-- SAMOA assembly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin.version}</version> + <configuration> + <finalName>SAMOA-Local-${project.version}</finalName> + <appendAssemblyId>false</appendAssemblyId> + <attach>false</attach> + <outputDirectory>../target</outputDirectory> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + <archive> + <manifestEntries> + <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> + <Bundle-Description>${project.description}</Bundle-Description> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>Yahoo Labs</Implementation-Vendor> + <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id> + </manifestEntries> + </archive> + </configuration> + <executions> + <execution> + <id>make-assembly</id> <!-- this is used for inheritance merges --> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + <configuration> + <argLine>-Xmx1G</argLine> + <redirectTestOutputToFile>false</redirectTestOutputToFile> + </configuration> + </plugin> + </plugins> + </build> </project>
http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-local/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/samoa-local/src/main/resources/log4j.xml b/samoa-local/src/main/resources/log4j.xml index cb40dec..ac00072 100644 --- a/samoa-local/src/main/resources/log4j.xml +++ b/samoa-local/src/main/resources/log4j.xml @@ -1,35 +1,21 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- - #%L - SAMOA - %% - Copyright (C) 2013 - 2014 Yahoo! Inc. - %% - Licensed under the Apache License, Version 2.0 (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. - #L% - --> +<!-- #%L SAMOA %% Copyright (C) 2013 - 2014 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (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. #L% --> <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <log4j:configuration debug="false"> - + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d [%t] %-5p %c (%F:%L) - %m%n"/> - </layout> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d [%t] %-5p %c (%F:%L) - %m%n" /> + </layout> </appender> - + <root> <priority value="info" /> - <appender-ref ref="CONSOLE"/> + <appender-ref ref="CONSOLE" /> </root> </log4j:configuration> http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-s4/pom.xml ---------------------------------------------------------------------- diff --git a/samoa-s4/pom.xml b/samoa-s4/pom.xml index b530d44..7ce5514 100644 --- a/samoa-s4/pom.xml +++ b/samoa-s4/pom.xml @@ -1,135 +1,121 @@ -<!-- - #%L - SAMOA - %% - Copyright (C) 2013 Yahoo! Inc. - %% - Licensed under the Apache License, Version 2.0 (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. - #L% - --> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> +<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (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. #L% --> +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> - <name>samoa-s4</name> - <description>S4 bindings for SAMOA</description> + <name>samoa-s4</name> + <description>S4 bindings for SAMOA</description> - <artifactId>samoa-s4</artifactId> - <parent> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa</artifactId> - <version>0.3.0-SNAPSHOT</version> - </parent> + <artifactId>samoa-s4</artifactId> + <parent> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa</artifactId> + <version>0.3.0-SNAPSHOT</version> + </parent> - <dependencies> - <dependency> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa-api</artifactId> - <version>${project.version}</version> - </dependency> + <dependencies> + <dependency> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa-api</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>com.github.javacliparser</groupId> - <artifactId>javacliparser</artifactId> - <version>${javacliparser.version}</version> - </dependency> + <dependency> + <groupId>com.github.javacliparser</groupId> + <artifactId>javacliparser</artifactId> + <version>${javacliparser.version}</version> + </dependency> - <!-- S4 dependencies need to be installed separately as they are - not available via Maven yet --> - <dependency> - <groupId>org.apache.s4</groupId> - <artifactId>s4-base</artifactId> - <version>${s4.version}</version> - <scope>provided</scope> - </dependency> + <!-- S4 dependencies need to be installed separately as they are not available via Maven yet --> + <dependency> + <groupId>org.apache.s4</groupId> + <artifactId>s4-base</artifactId> + <version>${s4.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.apache.s4</groupId> - <artifactId>s4-comm</artifactId> - <version>${s4.version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.apache.s4</groupId> + <artifactId>s4-comm</artifactId> + <version>${s4.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.apache.s4</groupId> - <artifactId>s4-core</artifactId> - <version>${s4.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> + <dependency> + <groupId>org.apache.s4</groupId> + <artifactId>s4-core</artifactId> + <version>${s4.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>${maven-dependency-plugin.version}</version> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> - <excludeGroupIds>org.apache.s4</excludeGroupIds> - <excludeTransitive>true</excludeTransitive> - </configuration> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - </execution> - </executions> - </plugin> + <excludeGroupIds>org.apache.s4</excludeGroupIds> + <excludeTransitive>true</excludeTransitive> + </configuration> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + </execution> + </executions> + </plugin> - <!-- SAMOA assembly --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <configuration> - <descriptors> - <descriptor>src/main/assembly/samoa-s4.xml</descriptor> - </descriptors> - <finalName>SAMOA-S4-${project.version}</finalName> - <attach>false</attach> - <outputDirectory>../target</outputDirectory> - <appendAssemblyId>false</appendAssemblyId> - <archive> - <manifestEntries> - <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> - <Bundle-Description>${project.description}</Bundle-Description> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>Yahoo Labs</Implementation-Vendor> - <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id> - <S4-App-Class>com.yahoo.labs.samoa.topology.impl.S4DoTask</S4-App-Class> - <S4-Version>${s4.version}</S4-Version> - </manifestEntries> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> <!-- this is used for inheritance merges --> - <phase>package</phase> <!-- bind to the packaging phase --> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <!-- SAMOA assembly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin.version}</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/samoa-s4.xml</descriptor> + </descriptors> + <finalName>SAMOA-S4-${project.version}</finalName> + <attach>false</attach> + <outputDirectory>../target</outputDirectory> + <appendAssemblyId>false</appendAssemblyId> + <archive> + <manifestEntries> + <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> + <Bundle-Description>${project.description}</Bundle-Description> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>Yahoo Labs</Implementation-Vendor> + <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id> + <S4-App-Class>com.yahoo.labs.samoa.topology.impl.S4DoTask</S4-App-Class> + <S4-Version>${s4.version}</S4-Version> + </manifestEntries> + </archive> + </configuration> + <executions> + <execution> + <id>make-assembly</id> <!-- this is used for inheritance merges --> + <phase>package</phase> <!-- bind to the packaging phase --> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-s4/samoa-s4-adapter/pom.xml ---------------------------------------------------------------------- diff --git a/samoa-s4/samoa-s4-adapter/pom.xml b/samoa-s4/samoa-s4-adapter/pom.xml index 031fb8a..8f1a7cf 100644 --- a/samoa-s4/samoa-s4-adapter/pom.xml +++ b/samoa-s4/samoa-s4-adapter/pom.xml @@ -1,52 +1,30 @@ -<!-- - #%L - SAMOA - %% - Copyright (C) 2013 Yahoo! Inc. - %% - Licensed under the Apache License, Version 2.0 (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. - #L% - --> +<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (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. #L% --> <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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> - <!-- PARENT MODULE SAMOA-S4 - <parent> - <groupId>com.yahoo.labs.bcn.samoa</groupId> - <artifactId>samoa-s4</artifactId> - <version>0.1</version> - </parent> - --> + <!-- PARENT MODULE SAMOA-S4 <parent> <groupId>com.yahoo.labs.bcn.samoa</groupId> <artifactId>samoa-s4</artifactId> <version>0.1</version> + </parent> --> - <!-- SAMOA-S4-ADAPTER MODUEL --> - <artifactId>samoa-s4-adapter</artifactId> - <groupId>com.yahoo.labs.bcn.samoa</groupId> - <version>0.1</version> - <name>samoa-s4-adapter</name> - <description>Adapter module to connect to external stream and also to provide entrance processing items for SAMOA</description> + <!-- SAMOA-S4-ADAPTER MODUEL --> + <artifactId>samoa-s4-adapter</artifactId> + <groupId>com.yahoo.labs.bcn.samoa</groupId> + <version>0.1</version> + <name>samoa-s4-adapter</name> + <description>Adapter module to connect to external stream and also to provide entrance processing items for SAMOA</description> - <dependencies> - <!-- dependency> - <artifactId>samoa-api</artifactId> - <groupId>com.yahoo.labs.bcn.samoa</groupId> - <version>0.1</version> - </dependency> --> - <dependency> - <artifactId>samoa-s4</artifactId> - <groupId>com.yahoo.labs.bcn.samoa</groupId> - <version>0.1</version> - </dependency> - </dependencies> + <dependencies> + <!-- dependency> <artifactId>samoa-api</artifactId> <groupId>com.yahoo.labs.bcn.samoa</groupId> <version>0.1</version> + </dependency> --> + <dependency> + <artifactId>samoa-s4</artifactId> + <groupId>com.yahoo.labs.bcn.samoa</groupId> + <version>0.1</version> + </dependency> + </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-s4/src/main/assembly/samoa-s4.xml ---------------------------------------------------------------------- diff --git a/samoa-s4/src/main/assembly/samoa-s4.xml b/samoa-s4/src/main/assembly/samoa-s4.xml index 8e5614a..e0acd0e 100644 --- a/samoa-s4/src/main/assembly/samoa-s4.xml +++ b/samoa-s4/src/main/assembly/samoa-s4.xml @@ -1,64 +1,48 @@ -<!-- - #%L - SAMOA - %% - Copyright (C) 2013 Yahoo! Inc. - %% - Licensed under the Apache License, Version 2.0 (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. - #L% - --> -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>dist</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> +<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (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. #L% --> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>dist</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <!-- SAMOA API artifacts --> - <fileSet> - <outputDirectory>lib/</outputDirectory> - <directory>../samoa-api/target/lib/</directory> - <includes> - <include>*</include> - </includes> - </fileSet> - <fileSet> - <outputDirectory>app/</outputDirectory> - <directory>../samoa-api/target/</directory> - <includes> - <include>samoa-api-*.jar</include> - </includes> - </fileSet> - - <!-- SAMOA S4 artifacts --> - <fileSet> - <outputDirectory>app/</outputDirectory> - <directory>target/</directory> - <includes> - <include>samoa-s4-*.jar</include> - </includes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <directory>target/</directory> - <includes> - <include>lib/*</include> - </includes> - </fileSet> - </fileSets> + <fileSets> + <!-- SAMOA API artifacts --> + <fileSet> + <outputDirectory>lib/</outputDirectory> + <directory>../samoa-api/target/lib/</directory> + <includes> + <include>*</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>app/</outputDirectory> + <directory>../samoa-api/target/</directory> + <includes> + <include>samoa-api-*.jar</include> + </includes> + </fileSet> + + <!-- SAMOA S4 artifacts --> + <fileSet> + <outputDirectory>app/</outputDirectory> + <directory>target/</directory> + <includes> + <include>samoa-s4-*.jar</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <directory>target/</directory> + <includes> + <include>lib/*</include> + </includes> + </fileSet> + </fileSets> </assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-samza/pom.xml ---------------------------------------------------------------------- diff --git a/samoa-samza/pom.xml b/samoa-samza/pom.xml index 8fd60a7..ffbdc7e 100644 --- a/samoa-samza/pom.xml +++ b/samoa-samza/pom.xml @@ -1,168 +1,142 @@ -<!-- - #%L - SAMOA - %% - Copyright (C) 2013 Yahoo! Inc. - %% - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (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. #L% --> +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> - http://www.apache.org/licenses/LICENSE-2.0 + <name>samoa-samza</name> + <description>Samza engine for SAMOA</description> - 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. - #L% - --> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + <artifactId>samoa-samza</artifactId> + <parent> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa</artifactId> + <version>0.3.0-SNAPSHOT</version> + </parent> - <name>samoa-samza</name> - <description>Samza engine for SAMOA</description> + <dependencies> + <dependency> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa-api</artifactId> + <version>${project.version}</version> + </dependency> - <artifactId>samoa-samza</artifactId> - <parent> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa</artifactId> - <version>0.3.0-SNAPSHOT</version> - </parent> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j-log4j12.version}</version> + </dependency> - <dependencies> - <dependency> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa-api</artifactId> - <version>${project.version}</version> - </dependency> + <!--<dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>11.0.2</version> </dependency> --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-log4j12.version}</version> - </dependency> + <dependency> + <groupId>org.apache.samza</groupId> + <artifactId>samza-api</artifactId> + <version>${samza.version}</version> + </dependency> - <!--<dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>11.0.2</version> - </dependency> --> + <dependency> + <groupId>org.apache.samza</groupId> + <artifactId>samza-core_2.10</artifactId> + <version>${samza.version}</version> + </dependency> - <dependency> - <groupId>org.apache.samza</groupId> - <artifactId>samza-api</artifactId> - <version>${samza.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.samza</groupId> - <artifactId>samza-core_2.10</artifactId> - <version>${samza.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.samza</groupId> - <artifactId>samza-serializers_2.10</artifactId> - <version>${samza.version}</version> - </dependency> - - <!--<dependency> - <groupId>org.apache.samza</groupId> - <artifactId>samza-shell</artifactId> - <classifier>dist</classifier> - <type>tgz</type> - <version>${samza.version}</version> - </dependency>--> - - <dependency> - <groupId>org.apache.samza</groupId> - <artifactId>samza-yarn_2.10</artifactId> - <version>${samza.version}</version> - </dependency> + <dependency> + <groupId>org.apache.samza</groupId> + <artifactId>samza-serializers_2.10</artifactId> + <version>${samza.version}</version> + </dependency> - <dependency> - <groupId>org.apache.samza</groupId> - <artifactId>samza-kafka_2.10</artifactId> - <version>${samza.version}</version> - </dependency> + <!--<dependency> <groupId>org.apache.samza</groupId> <artifactId>samza-shell</artifactId> <classifier>dist</classifier> + <type>tgz</type> <version>${samza.version}</version> </dependency> --> - <dependency> - <groupId>org.apache.kafka</groupId> - <artifactId>kafka_2.10</artifactId> - <version>${kafka.version}</version> - </dependency> - <dependency> - <groupId>com.101tec</groupId> - <artifactId>zkclient</artifactId> - <version>0.4</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> - </dependency> - </dependencies> + <dependency> + <groupId>org.apache.samza</groupId> + <artifactId>samza-yarn_2.10</artifactId> + <version>${samza.version}</version> + </dependency> - <build> - <plugins> - <!-- SAMOA assembly --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <configuration> - - <descriptors> - <descriptor>src/main/assembly/samoa-samza.xml</descriptor> - </descriptors> - <finalName>SAMOA-Samza-${project.version}</finalName> - <appendAssemblyId>false</appendAssemblyId> - <attach>false</attach> - <outputDirectory>../target</outputDirectory> - <!-- - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - --> - <archive> - <manifestEntries> - <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> - <Bundle-Description>${project.description}</Bundle-Description> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>Yahoo Labs</Implementation-Vendor> - <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id> - </manifestEntries> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> <!-- this is used for inheritance merges --> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - </build> + <dependency> + <groupId>org.apache.samza</groupId> + <artifactId>samza-kafka_2.10</artifactId> + <version>${samza.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.kafka</groupId> + <artifactId>kafka_2.10</artifactId> + <version>${kafka.version}</version> + </dependency> + <dependency> + <groupId>com.101tec</groupId> + <artifactId>zkclient</artifactId> + <version>0.4</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <!-- SAMOA assembly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin.version}</version> + <configuration> + + <descriptors> + <descriptor>src/main/assembly/samoa-samza.xml</descriptor> + </descriptors> + <finalName>SAMOA-Samza-${project.version}</finalName> + <appendAssemblyId>false</appendAssemblyId> + <attach>false</attach> + <outputDirectory>../target</outputDirectory> + <!-- <descriptorRefs> <descriptorRef>jar-with-dependencies</descriptorRef> </descriptorRefs> --> + <archive> + <manifestEntries> + <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> + <Bundle-Description>${project.description}</Bundle-Description> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>Yahoo Labs</Implementation-Vendor> + <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id> + </manifestEntries> + </archive> + </configuration> + <executions> + <execution> + <id>make-assembly</id> <!-- this is used for inheritance merges --> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-samza/src/main/assembly/samoa-samza.xml ---------------------------------------------------------------------- diff --git a/samoa-samza/src/main/assembly/samoa-samza.xml b/samoa-samza/src/main/assembly/samoa-samza.xml index ead1c0a..71961c7 100644 --- a/samoa-samza/src/main/assembly/samoa-samza.xml +++ b/samoa-samza/src/main/assembly/samoa-samza.xml @@ -1,38 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - SAMOA - %% - Copyright (C) 2013 - 2014 Yahoo! Inc. - %% - Licensed under the Apache License, Version 2.0 (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. - #L% - --> +<!-- #%L SAMOA %% Copyright (C) 2013 - 2014 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (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. #L% --> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - you under the Apache License, Version 2.0 (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. --> +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file + distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under + the Apache License, Version 2.0 (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. --> -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> <id>dist</id> <formats> @@ -66,16 +47,8 @@ </file> </files> <dependencySets> - <!-- - <dependencySet> - <outputDirectory>bin</outputDirectory> - <includes> - <include>org.apache.samza:samza-shell:tgz:dist:*</include> - </includes> - <fileMode>0744</fileMode> - <unpack>true</unpack> - </dependencySet> - --> + <!-- <dependencySet> <outputDirectory>bin</outputDirectory> <includes> <include>org.apache.samza:samza-shell:tgz:dist:*</include> + </includes> <fileMode>0744</fileMode> <unpack>true</unpack> </dependencySet> --> <dependencySet> <unpack>true</unpack> <includes> http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-samza/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/samoa-samza/src/main/resources/log4j.xml b/samoa-samza/src/main/resources/log4j.xml index 86451cf..e41fdf8 100644 --- a/samoa-samza/src/main/resources/log4j.xml +++ b/samoa-samza/src/main/resources/log4j.xml @@ -1,69 +1,42 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- - #%L - SAMOA - %% - Copyright (C) 2013 - 2014 Yahoo! Inc. - %% - Licensed under the Apache License, Version 2.0 (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. - #L% - --> +<!-- #%L SAMOA %% Copyright (C) 2013 - 2014 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (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. #L% --> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (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. - ---> +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file + distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under + the Apache License, Version 2.0 (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. --> <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> - + <appender name="RollingAppender" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="File" value="${samza.log.dir}/${samza.container.name}.log" /> - <param name="DatePattern" value="'.'yyyy-MM-dd" /> - <layout class="org.apache.log4j.PatternLayout"> + <param name="File" value="${samza.log.dir}/${samza.container.name}.log" /> + <param name="DatePattern" value="'.'yyyy-MM-dd" /> + <layout class="org.apache.log4j.PatternLayout"> <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n" /> - </layout> + </layout> </appender> - + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d [%t] %-5p %c (%F:%L) - %m%n"/> - </layout> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d [%t] %-5p %c (%F:%L) - %m%n" /> + </layout> </appender> <category name="com.yahoo.labs" additivity="false"> - <priority value="info"/> - <appender-ref ref="CONSOLE"/> + <priority value="info" /> + <appender-ref ref="CONSOLE" /> </category> - + <root> <priority value="info" /> - <appender-ref ref="RollingAppender"/> + <appender-ref ref="RollingAppender" /> </root> </log4j:configuration> http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-storm/pom.xml ---------------------------------------------------------------------- diff --git a/samoa-storm/pom.xml b/samoa-storm/pom.xml index 7929593..b7e93ba 100644 --- a/samoa-storm/pom.xml +++ b/samoa-storm/pom.xml @@ -1,123 +1,110 @@ -<!-- - #%L - SAMOA - %% - Copyright (C) 2013 Yahoo! Inc. - %% - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (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. #L% --> +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> - http://www.apache.org/licenses/LICENSE-2.0 + <name>samoa-storm</name> + <description>Storm bindings for SAMOA</description> - 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. - #L% - --> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + <artifactId>samoa-storm</artifactId> + <parent> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa</artifactId> + <version>0.3.0-SNAPSHOT</version> + </parent> - <name>samoa-storm</name> - <description>Storm bindings for SAMOA</description> + <repositories> + <repository> <!-- repository for Storm --> + <id>clojars</id> + <url>http://clojars.org/repo/</url> + </repository> + </repositories> - <artifactId>samoa-storm</artifactId> - <parent> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa</artifactId> - <version>0.3.0-SNAPSHOT</version> - </parent> + <dependencies> + <dependency> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa-test</artifactId> + <type>test-jar</type> + <classifier>test-jar-with-dependencies</classifier> + <version>${project.version}</version> + <scope>test</scope> + </dependency> - <repositories> - <repository> <!-- repository for Storm --> - <id>clojars</id> - <url>http://clojars.org/repo/</url> - </repository> - </repositories> + <dependency> + <groupId>storm</groupId> + <artifactId>storm</artifactId> + <version>${storm.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${zookeeper.storm.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j-log4j12.version}</version> + <scope>test</scope> + </dependency> + </dependencies> - <dependencies> - <dependency> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa-test</artifactId> - <type>test-jar</type> - <classifier>test-jar-with-dependencies</classifier> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>storm</groupId> - <artifactId>storm</artifactId> - <version>${storm.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>${zookeeper.storm.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-log4j12.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <!-- SAMOA assembly --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <configuration> - <finalName>SAMOA-Storm-${project.version}</finalName> - <appendAssemblyId>false</appendAssemblyId> - <attach>false</attach> - <outputDirectory>../target</outputDirectory> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifestEntries> - <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> - <Bundle-Description>${project.description}</Bundle-Description> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>Yahoo Labs</Implementation-Vendor> - <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id> - </manifestEntries> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> <!-- this is used for inheritance merges --> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> - <configuration> - <argLine>-Xmx1G</argLine> - <redirectTestOutputToFile>false</redirectTestOutputToFile> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <!-- SAMOA assembly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin.version}</version> + <configuration> + <finalName>SAMOA-Storm-${project.version}</finalName> + <appendAssemblyId>false</appendAssemblyId> + <attach>false</attach> + <outputDirectory>../target</outputDirectory> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + <archive> + <manifestEntries> + <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> + <Bundle-Description>${project.description}</Bundle-Description> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>Yahoo Labs</Implementation-Vendor> + <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id> + </manifestEntries> + </archive> + </configuration> + <executions> + <execution> + <id>make-assembly</id> <!-- this is used for inheritance merges --> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + <configuration> + <argLine>-Xmx1G</argLine> + <redirectTestOutputToFile>false</redirectTestOutputToFile> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-test/pom.xml ---------------------------------------------------------------------- diff --git a/samoa-test/pom.xml b/samoa-test/pom.xml index 2ee103b..994d35d 100644 --- a/samoa-test/pom.xml +++ b/samoa-test/pom.xml @@ -1,65 +1,64 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>samoa</artifactId> - <groupId>com.yahoo.labs.samoa</groupId> - <version>0.3.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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/xsd/maven-4.0.0.xsd";> + <parent> + <artifactId>samoa</artifactId> + <groupId>com.yahoo.labs.samoa</groupId> + <version>0.3.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>samoa-test</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-csv</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa-api</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/test-jar-with-dependencies.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <artifactId>samoa-test</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-csv</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa-api</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/test-jar-with-dependencies.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-test/src/main/assembly/test-jar-with-dependencies.xml ---------------------------------------------------------------------- diff --git a/samoa-test/src/main/assembly/test-jar-with-dependencies.xml b/samoa-test/src/main/assembly/test-jar-with-dependencies.xml index 51465cc..72a83f4 100644 --- a/samoa-test/src/main/assembly/test-jar-with-dependencies.xml +++ b/samoa-test/src/main/assembly/test-jar-with-dependencies.xml @@ -1,19 +1,18 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>test-jar-with-dependencies</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <outputDirectory>/</outputDirectory> - <useProjectArtifact>true</useProjectArtifact> - <!-- we're creating the test-jar as an attachement --> - <useProjectAttachments>true</useProjectAttachments> - <useTransitiveDependencies>false</useTransitiveDependencies> - <unpack>true</unpack> - </dependencySet> - </dependencySets> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>test-jar-with-dependencies</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <useProjectArtifact>true</useProjectArtifact> + <!-- we're creating the test-jar as an attachement --> + <useProjectAttachments>true</useProjectAttachments> + <useTransitiveDependencies>false</useTransitiveDependencies> + <unpack>true</unpack> + </dependencySet> + </dependencySets> </assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/6539c913/samoa-threads/pom.xml ---------------------------------------------------------------------- diff --git a/samoa-threads/pom.xml b/samoa-threads/pom.xml index c4a6fb4..630017f 100644 --- a/samoa-threads/pom.xml +++ b/samoa-threads/pom.xml @@ -1,112 +1,99 @@ -<!-- - #%L - SAMOA - %% - Copyright (C) 2013 Yahoo! Inc. - %% - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (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. #L% --> +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> - http://www.apache.org/licenses/LICENSE-2.0 + <name>samoa-threads</name> + <description>Multithreading local engine for SAMOA</description> - 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. - #L% - --> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + <artifactId>samoa-threads</artifactId> + <parent> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa</artifactId> + <version>0.3.0-SNAPSHOT</version> + </parent> - <name>samoa-threads</name> - <description>Multithreading local engine for SAMOA</description> + <dependencies> + <dependency> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa-api</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.yahoo.labs.samoa</groupId> + <artifactId>samoa-test</artifactId> + <type>test-jar</type> + <classifier>test-jar-with-dependencies</classifier> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j-simple.version}</version> + </dependency> + </dependencies> - <artifactId>samoa-threads</artifactId> - <parent> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa</artifactId> - <version>0.3.0-SNAPSHOT</version> - </parent> - - <dependencies> - <dependency> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa-api</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.yahoo.labs.samoa</groupId> - <artifactId>samoa-test</artifactId> - <type>test-jar</type> - <classifier>test-jar-with-dependencies</classifier> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${slf4j-simple.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <!-- SAMOA assembly --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <configuration> - <finalName>SAMOA-Threads-${project.version}</finalName> - <appendAssemblyId>false</appendAssemblyId> - <attach>false</attach> - <outputDirectory>../target</outputDirectory> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifestEntries> - <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> - <Bundle-Description>${project.description}</Bundle-Description> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>Yahoo Labs</Implementation-Vendor> - <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id> - </manifestEntries> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> <!-- this is used for inheritance merges --> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> - <configuration> - <argLine>-Xmx1G</argLine> - <redirectTestOutputToFile>false</redirectTestOutputToFile> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <!-- SAMOA assembly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin.version}</version> + <configuration> + <finalName>SAMOA-Threads-${project.version}</finalName> + <appendAssemblyId>false</appendAssemblyId> + <attach>false</attach> + <outputDirectory>../target</outputDirectory> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + <archive> + <manifestEntries> + <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> + <Bundle-Description>${project.description}</Bundle-Description> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>Yahoo Labs</Implementation-Vendor> + <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id> + </manifestEntries> + </archive> + </configuration> + <executions> + <execution> + <id>make-assembly</id> <!-- this is used for inheritance merges --> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + <configuration> + <argLine>-Xmx1G</argLine> + <redirectTestOutputToFile>false</redirectTestOutputToFile> + </configuration> + </plugin> + </plugins> + </build> </project>
