diff options
43 files changed, 0 insertions, 876 deletions
diff --git a/install_java.cmake b/install_java.cmake index 52d6ba19d2c..97fdae3267b 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -173,7 +173,6 @@ install(FILES jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.server.def jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.servlet-paths.def jdisc_jmx_metrics/src/main/resources/configdefinitions/jmx-metric.def - jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/main/resources/configdefinitions/example.def logd/src/main/resources/configdefinitions/logd.def messagebus/src/main/config/messagebus.def metrics/src/vespa/metrics/metricsmanager.def diff --git a/jdisc_container_maven_archetype_application/.gitignore b/jdisc_container_maven_archetype_application/.gitignore deleted file mode 100644 index 12251442258..00000000000 --- a/jdisc_container_maven_archetype_application/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/pom.xml.build diff --git a/jdisc_container_maven_archetype_application/OWNERS b/jdisc_container_maven_archetype_application/OWNERS deleted file mode 100644 index 78b92e411b4..00000000000 --- a/jdisc_container_maven_archetype_application/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -gjoranv -bjorncs diff --git a/jdisc_container_maven_archetype_application/pom.xml b/jdisc_container_maven_archetype_application/pom.xml deleted file mode 100644 index a7073ded403..00000000000 --- a/jdisc_container_maven_archetype_application/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<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> - <parent> - <groupId>com.yahoo.vespa</groupId> - <artifactId>parent</artifactId> - <version>6-SNAPSHOT</version> - </parent> - <!-- Package name must contain _maven_archetype --> - <artifactId>jdisc_container_maven_archetype_application</artifactId> - <version>6-SNAPSHOT</version> - <packaging>maven-archetype</packaging> - <build> - <extensions> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - </extension> - </extensions> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>archetype-resources/pom.xml</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>archetype-resources/pom.xml</exclude> - </excludes> - </resource> - </resources> - </build> -</project> diff --git a/jdisc_container_maven_archetype_application/src/main/resources/META-INF/maven/archetype-metadata.xml b/jdisc_container_maven_archetype_application/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index b2885c6a40b..00000000000 --- a/jdisc_container_maven_archetype_application/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<archetype-descriptor - name="sample-container-plugin" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 - http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" - xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <fileSets> - <fileSet filtered="true" packaged="true" encoding="UTF-8"> - <directory>src/main/java</directory> - <includes> - <include>**/*.java</include> - </includes> - </fileSet> - <fileSet filtered="true" packaged="true" encoding="UTF-8"> - <directory>src/test/java</directory> - <includes> - <include>**/*.java</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory>src/main/application</directory> - <includes> - <include>**/*.xml</include> - <include>**/*.json</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory>src/main/resources</directory> - <includes> - <include>**/*.def</include> - </includes> - </fileSet> - </fileSets> -</archetype-descriptor> diff --git a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/pom.xml b/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index 6d67c36a0d8..00000000000 --- a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<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> - <groupId>\${groupId}</groupId> - <artifactId>\${artifactId}</artifactId> - <version>\${version}</version> - <packaging>container-plugin</packaging> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.10</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>application</artifactId> - <version>${vespa_version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-dev</artifactId> - <version>${vespa_version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.13</version> - <configuration> - <systemPropertyVariables> - <isMavenSurefirePlugin>true</isMavenSurefirePlugin> - </systemPropertyVariables> - <redirectTestOutputToFile>\${test.hide}</redirectTestOutputToFile> - </configuration> - </plugin> - <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespa-application-maven-plugin</artifactId> - <version>${vespa_version}</version> - <executions> - <execution> - <goals> - <goal>packageApplication</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <test.hide>true</test.hide> - </properties> -</project> diff --git a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/application/hosts.xml b/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/application/hosts.xml deleted file mode 100644 index 3ab86a21aef..00000000000 --- a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/application/hosts.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<hosts> - <host name="localhost"> - <alias>node1</alias> - </host> -</hosts> diff --git a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/application/package.json b/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/application/package.json deleted file mode 100644 index b6ed9f0efd5..00000000000 --- a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/application/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "${artifactId}", - "version": "${version}", - "dependencies": { - "connect": ">=0.2.4" - }, - "yahoo": { - "dist-package" : { - "tag-name-with-userid" : true - } - } -} diff --git a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/application/services.xml b/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/application/services.xml deleted file mode 100644 index 11d74a8133f..00000000000 --- a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/application/services.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<services version="1.0"> - <admin version="2.0"> - <adminserver hostalias="node1"/> - </admin> - <jdisc version="1.0"> - <processing> - <chain id="default"> - <processor id="${package}.ExampleProcessor" bundle="${artifactId}"> - <config name="example.example-processor"> - <message>Hello, services!</message> - </config> - </processor> - </chain> - </processing> - <nodes> - <node hostalias="node1"/> - </nodes> - </jdisc> -</services> diff --git a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/java/ExampleProcessor.java b/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/java/ExampleProcessor.java deleted file mode 100644 index d13efa7b884..00000000000 --- a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/java/ExampleProcessor.java +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package ${package}; - -import com.google.inject.Inject; -import com.yahoo.example.ExampleProcessorConfig; -import com.yahoo.processing.Processor; -import com.yahoo.processing.Request; -import com.yahoo.processing.Response; -import com.yahoo.processing.execution.Execution; - -public class ExampleProcessor extends Processor { - - private final String message; - - @Inject - public ExampleProcessor(ExampleProcessorConfig config) { - this.message = config.message(); - } - - @SuppressWarnings("unchecked") - @Override - public Response process(Request request, Execution execution) { - // process the request - request.properties().set("foo", "bar"); - - // pass it down the chain to get a response - Response response = execution.process(request); - - // process the response - response.data().add(new StringData(request, message)); - - // return the response up the chain - return response; - } -} diff --git a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/java/StringData.java b/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/java/StringData.java deleted file mode 100644 index 6215dc3c39e..00000000000 --- a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/java/StringData.java +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package ${package}; - -import com.yahoo.processing.Request; -import com.yahoo.processing.response.AbstractData; - -public class StringData extends AbstractData { - - private final String string; - - public StringData(Request request, String string) { - super(request); - this.string = string; - } - - @Override - public String toString() { - return string; - } -}
\ No newline at end of file diff --git a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/resources/configdefinitions/example-processor.def b/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/resources/configdefinitions/example-processor.def deleted file mode 100644 index 1028451c312..00000000000 --- a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/main/resources/configdefinitions/example-processor.def +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=example -message string default="" diff --git a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/test/java/ApplicationMain.java b/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/test/java/ApplicationMain.java deleted file mode 100644 index c6148866a62..00000000000 --- a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/test/java/ApplicationMain.java +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package ${package}; - -import com.yahoo.application.Networking; -import org.junit.Test; - -import java.nio.file.FileSystems; - -import static org.junit.Assume.assumeTrue; - -public class ApplicationMain { - - @Test - public void runFromMaven() throws Exception { - assumeTrue(Boolean.valueOf(System.getProperty("isMavenSurefirePlugin"))); - main(null); - } - - public static void main(String[] args) throws Exception { - try (com.yahoo.application.Application app = com.yahoo.application.Application.fromApplicationPackage( - FileSystems.getDefault().getPath("src/main/application"), - Networking.enable)) { - app.getClass(); // throws NullPointerException - Thread.sleep(Long.MAX_VALUE); - } - } -}
\ No newline at end of file diff --git a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/test/java/ApplicationTest.java b/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/test/java/ApplicationTest.java deleted file mode 100644 index d80f4572cf0..00000000000 --- a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/test/java/ApplicationTest.java +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package ${package}; - -import com.yahoo.application.Application; -import com.yahoo.application.Networking; -import com.yahoo.application.container.Processing; -import com.yahoo.component.ComponentSpecification; -import com.yahoo.processing.Request; -import com.yahoo.processing.Response; -import org.junit.Test; - -import java.nio.file.FileSystems; - -import static org.junit.Assert.assertThat; -import static org.junit.internal.matchers.StringContains.containsString; - -public class ApplicationTest { - - @Test - public void requireThatResultContainsHelloWorld() throws Exception { - try (Application app = Application.fromApplicationPackage( - FileSystems.getDefault().getPath("src/main/application"), - Networking.disable)) { - Processing processing = app.getJDisc("jdisc").processing(); - Response response = processing.process(ComponentSpecification.fromString("default"), new Request()); - assertThat(response.data().get(0).toString(), containsString("Hello, services!")); - } - } -} diff --git a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/test/java/ExampleProcessorTest.java b/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/test/java/ExampleProcessorTest.java deleted file mode 100644 index aa11a3529eb..00000000000 --- a/jdisc_container_maven_archetype_application/src/main/resources/archetype-resources/src/test/java/ExampleProcessorTest.java +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package ${package}; - -import com.yahoo.component.chain.Chain; -import com.yahoo.example.ExampleProcessorConfig; -import com.yahoo.processing.Processor; -import com.yahoo.processing.Request; -import com.yahoo.processing.Response; -import com.yahoo.processing.execution.Execution; -import org.junit.Test; - -import static org.junit.Assert.assertThat; -import static org.junit.matchers.JUnitMatchers.containsString; - -public class ExampleProcessorTest { - - @Test - public void requireThatResultContainsHelloWorld() { - ExampleProcessorConfig.Builder config = new ExampleProcessorConfig.Builder().message("Hello, processor!"); - Processor processor = new ExampleProcessor(new ExampleProcessorConfig(config)); - - Response response = newExecution(processor).process(new Request()); - assertThat(response.data().get(0).toString(), containsString("Hello, processor!")); - } - - private static Execution newExecution(Processor... processors) { - return Execution.createRoot(new Chain<>(processors), 0, Execution.Environment.createEmpty()); - } -} diff --git a/jdisc_container_maven_archetype_application/src/test/resources/projects/basic/archetype.properties b/jdisc_container_maven_archetype_application/src/test/resources/projects/basic/archetype.properties deleted file mode 100644 index fe86ff801b8..00000000000 --- a/jdisc_container_maven_archetype_application/src/test/resources/projects/basic/archetype.properties +++ /dev/null @@ -1,4 +0,0 @@ -version=98.76.54 -groupId=com.yahoo.vespa.testGroupId -artifactId=jdisc-container-application-archetype-it -package=com.yahoo.test.jdisc.container diff --git a/jdisc_container_maven_archetype_application/src/test/resources/projects/basic/goal.txt b/jdisc_container_maven_archetype_application/src/test/resources/projects/basic/goal.txt deleted file mode 100644 index ba3bd787383..00000000000 --- a/jdisc_container_maven_archetype_application/src/test/resources/projects/basic/goal.txt +++ /dev/null @@ -1 +0,0 @@ -package diff --git a/jdisc_maven_archetype_component/.gitignore b/jdisc_maven_archetype_component/.gitignore deleted file mode 100644 index 12251442258..00000000000 --- a/jdisc_maven_archetype_component/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/pom.xml.build diff --git a/jdisc_maven_archetype_component/OWNERS b/jdisc_maven_archetype_component/OWNERS deleted file mode 100644 index 78b92e411b4..00000000000 --- a/jdisc_maven_archetype_component/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -gjoranv -bjorncs diff --git a/jdisc_maven_archetype_component/pom.xml b/jdisc_maven_archetype_component/pom.xml deleted file mode 100644 index 2926eccabcb..00000000000 --- a/jdisc_maven_archetype_component/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<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> - <parent> - <groupId>com.yahoo.vespa</groupId> - <artifactId>parent</artifactId> - <version>6-SNAPSHOT</version> - </parent> - <!-- Package name must contain _maven_archetype --> - <artifactId>jdisc_maven_archetype_component</artifactId> - <version>6-SNAPSHOT</version> - <packaging>maven-archetype</packaging> - <build> - <extensions> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - </extension> - </extensions> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>archetype-resources/pom.xml</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>archetype-resources/pom.xml</exclude> - </excludes> - </resource> - </resources> - </build> -</project> diff --git a/jdisc_maven_archetype_component/src/main/resources/META-INF/maven/archetype-metadata.xml b/jdisc_maven_archetype_component/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 5733e99880d..00000000000 --- a/jdisc_maven_archetype_component/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="sample-container-plugin" - xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <fileSets> - <fileSet filtered="true" packaged="true" encoding="UTF-8"> - <directory>src/main/java</directory> - <includes> - <include>**/*.java</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory>src/main/resources</directory> - <includes> - <include>**/*.def</include> - </includes> - </fileSet> - </fileSets> -</archetype-descriptor> diff --git a/jdisc_maven_archetype_component/src/main/resources/archetype-resources/pom.xml b/jdisc_maven_archetype_component/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index 77d7d8c6c39..00000000000 --- a/jdisc_maven_archetype_component/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<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> - - <groupId>\${groupId}</groupId> - <artifactId>\${artifactId}</artifactId> <!-- Also used as Bundle-SymbolicName --> - <version>\${version}</version> <!-- Also used as the Bundle-Version --> - <packaging>container-plugin</packaging> - <name>sample container plugin</name> - - <description>Starting point for creating a maven container plugin.</description> - - <build> - <plugins> - <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <version>${vespa_version}</version> - <extensions>true</extensions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <showDeprecation>true</showDeprecation> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.9</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-dev</artifactId> - <version>${vespa_version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> -</project> diff --git a/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/main/java/ExampleProcessor.java b/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/main/java/ExampleProcessor.java deleted file mode 100644 index 88ebe04bd20..00000000000 --- a/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/main/java/ExampleProcessor.java +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package ${package}; - -import com.yahoo.processing.*; -import com.yahoo.processing.execution.Execution; - -public class ExampleProcessor extends Processor { - - @Override - public Response process(Request request, Execution execution) { - // Process the Request: - request.properties().set("foo","bar"); - - // Pass it down the chain to get a response - Response response=execution.process(request); - - // process the response - response.data().add(new StringData(request,"Hello, world!")); - - return response; - } - -}
\ No newline at end of file diff --git a/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/main/java/StringData.java b/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/main/java/StringData.java deleted file mode 100644 index d6363409dc8..00000000000 --- a/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/main/java/StringData.java +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package ${package}; - -import com.yahoo.processing.Request; -import com.yahoo.processing.response.AbstractData; - -/** A simple response data type */ -public class StringData extends AbstractData { - - private String string; - - public StringData(Request request, String string) { - super(request); - this.string = string; - } - - public void setString(String string) { - this.string = string; - } - - @Override - public String toString() { - return string; - } - -}
\ No newline at end of file diff --git a/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/main/resources/configdefinitions/example.def b/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/main/resources/configdefinitions/example.def deleted file mode 100644 index 471f6997ae1..00000000000 --- a/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/main/resources/configdefinitions/example.def +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 -namespace=example -message string default="Hello, World!" diff --git a/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/test/java/ExampleProcessorTest.java b/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/test/java/ExampleProcessorTest.java deleted file mode 100644 index 1107cde6387..00000000000 --- a/jdisc_maven_archetype_component/src/main/resources/archetype-resources/src/test/java/ExampleProcessorTest.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package ${package}; - -import com.yahoo.component.chain.Chain; -import com.yahoo.processing.Processor; -import com.yahoo.processing.Request; -import com.yahoo.processing.Response; -import com.yahoo.processing.execution.Execution; -import org.junit.Test; - -import static org.junit.Assert.assertThat; -import static org.junit.matchers.JUnitMatchers.containsString; - - -public class ExampleProcessorTest { - @Test - public void requireThatResultContainsHelloWorld() { - ExampleProcessor processor = new ExampleProcessor(); - Chain<Processor> chain = new Chain<Processor>(processor); - - Execution execution = Execution.createRoot(chain, 0, Execution.Environment.createEmpty()); - Response response = execution.process(new Request()); - assertThat(response.data().get(0).toString(), containsString("Hello, world!")); - } -} diff --git a/jdisc_maven_archetype_component/src/test/resources/projects/basic/archetype.properties b/jdisc_maven_archetype_component/src/test/resources/projects/basic/archetype.properties deleted file mode 100644 index bada3a0669c..00000000000 --- a/jdisc_maven_archetype_component/src/test/resources/projects/basic/archetype.properties +++ /dev/null @@ -1,3 +0,0 @@ -version=6-SNAPSHOT -groupId=com.yahoo.vespa -artifactId=container-plugin diff --git a/jdisc_maven_archetype_component/src/test/resources/projects/basic/goal.txt b/jdisc_maven_archetype_component/src/test/resources/projects/basic/goal.txt deleted file mode 100644 index 0ee40edb3f5..00000000000 --- a/jdisc_maven_archetype_component/src/test/resources/projects/basic/goal.txt +++ /dev/null @@ -1 +0,0 @@ -Create plugins for vespa container(e.g. searcher, docproc, handler). @@ -1132,13 +1132,11 @@ <module>indexinglanguage</module> <module>jaxrs_client_utils</module> <module>jaxrs_utils</module> - <module>jdisc_container_maven_archetype_application</module> <module>jdisc_core</module> <module>jdisc_core_test</module> <module>jdisc_http_service</module> <module>jdisc_jetty</module> <module>jdisc_jmx_metrics</module> - <module>jdisc_maven_archetype_component</module> <module>jdisc_messagebus_service</module> <module>jrt</module> <module>libmlr</module> diff --git a/vespa_application_maven_archetype_plugin/.gitignore b/vespa_application_maven_archetype_plugin/.gitignore deleted file mode 100644 index 12251442258..00000000000 --- a/vespa_application_maven_archetype_plugin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/pom.xml.build diff --git a/vespa_application_maven_archetype_plugin/OWNERS b/vespa_application_maven_archetype_plugin/OWNERS deleted file mode 100644 index 3b2ba1ede81..00000000000 --- a/vespa_application_maven_archetype_plugin/OWNERS +++ /dev/null @@ -1 +0,0 @@ -gjoranv diff --git a/vespa_application_maven_archetype_plugin/pom.xml b/vespa_application_maven_archetype_plugin/pom.xml deleted file mode 100644 index 4f9c8ae444d..00000000000 --- a/vespa_application_maven_archetype_plugin/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<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> - <parent> - <groupId>com.yahoo.vespa</groupId> - <artifactId>parent</artifactId> - <version>6-SNAPSHOT</version> - </parent> - <!-- Package name must contain _maven_archetype --> - <artifactId>vespa_application_maven_archetype_plugin</artifactId> - <version>6-SNAPSHOT</version> - <packaging>maven-archetype</packaging> - <build> - <extensions> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - </extension> - </extensions> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>archetype-resources/pom.xml</include> - <include>archetype-resources/components/pom.xml</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>archetype-resources/components/pom.xml</exclude> - <exclude>archetype-resources/pom.xml</exclude> - </excludes> - </resource> - </resources> - </build> -</project> diff --git a/vespa_application_maven_archetype_plugin/src/main/resources/META-INF/maven/archetype-metadata.xml b/vespa_application_maven_archetype_plugin/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 6f1abc5ba22..00000000000 --- a/vespa_application_maven_archetype_plugin/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="sample-container-plugin" - xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <fileSets> - <fileSet filtered="true" packaged="true" encoding="UTF-8"> - <directory>components/src/main/java</directory> - <includes> - <include>**/*.java</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory>src/main/application</directory> - <includes> - <include>**/*.xml</include> - <include>**/*.json</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory>components</directory> - <includes> - <include>**/*.xml</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory>components/src/main/resources</directory> - <includes> - <include>**/*.def</include> - </includes> - </fileSet> - </fileSets> -</archetype-descriptor> diff --git a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/pom.xml b/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/pom.xml deleted file mode 100644 index ce5e0399434..00000000000 --- a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<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> - - <!-- See vespa documentation container-components.html for help --> - - <groupId>\${groupId}</groupId> - <artifactId>\${artifactId}</artifactId> <!-- Also used as Bundle-SymbolicName --> - <version>\${version}</version> <!-- Also used as the Bundle-Version --> - <packaging>container-plugin</packaging> - <name>sample container plugin</name> - - <description>Starting point for creating a maven container plugin.</description> - - <build> - <plugins> - <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <version>${vespa_version}</version> - <extensions>true</extensions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <showDeprecation>true</showDeprecation> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.9</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-dev</artifactId> - <version>${vespa_version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> -</project> diff --git a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/src/main/java/ExampleDocumentProcessor.java b/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/src/main/java/ExampleDocumentProcessor.java deleted file mode 100644 index bf18b53909d..00000000000 --- a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/src/main/java/ExampleDocumentProcessor.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package ${package}; - -import com.yahoo.document.*; -import com.yahoo.docproc.*; - -import com.yahoo.example.ExampleConfig; -import com.yahoo.document.datatypes.StringFieldValue; - -/** - * An example document processor. - * - * @author Joe Developer - */ -public class ExampleDocumentProcessor extends DocumentProcessor { - private final String message; - private final String field = "message"; - - public ExampleDocumentProcessor(ExampleConfig config) { - message = config.message(); - } - - - public Progress process(Processing processing) { - for (DocumentOperation op : processing.getDocumentOperations()) { - if (op instanceof DocumentPut) { - DocumentPut put = (DocumentPut) op; - Document document = put.getDocument(); - document.setFieldValue(field, new StringFieldValue(message)); - } else if (base instanceof DocumentUpdate) { - DocumentUpdate update = (DocumentUpdate) base; - //TODO do something to 'update' here - } else if (base instanceof DocumentRemove) { - DocumentRemove remove = (DocumentRemove) base; - //TODO do something to 'remove' here - } - } - return Progress.DONE; - } - -} diff --git a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/src/main/java/ExampleSearcher.java b/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/src/main/java/ExampleSearcher.java deleted file mode 100644 index 2eb27f6d4c9..00000000000 --- a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/src/main/java/ExampleSearcher.java +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package ${package}; - -import com.yahoo.search.Query; -import com.yahoo.search.Result; -import com.yahoo.search.Searcher; -import com.yahoo.search.result.Hit; -import com.yahoo.search.searchchain.Execution; -import com.yahoo.example.ExampleConfig; - -/** - * A searcher adding a new hit. - * - * @author Joe Developer - */ -public class ExampleSearcher extends Searcher { - private final String message; - - public ExampleSearcher(ExampleConfig config) { - message = config.message(); - } - - public Result search(Query query,Execution execution) { - Hit hit = new Hit("ExampleHit"); - hit.setField("message", message); - - Result result = execution.search(query); - result.hits().add(hit); - return result; - } -} diff --git a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/src/main/resources/configdefinitions/example.def b/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/src/main/resources/configdefinitions/example.def deleted file mode 100644 index 471f6997ae1..00000000000 --- a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/components/src/main/resources/configdefinitions/example.def +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 -namespace=example -message string default="Hello, World!" diff --git a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/pom.xml b/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index 214f52880cf..00000000000 --- a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<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> - <groupId>test</groupId> - <artifactId>test-application</artifactId> - <packaging>pom</packaging> - <version>${vespa_version}</version> - <name>application</name> - - <modules> - <module>components</module> - </modules> - <pluginRepositories> - <pluginRepository> - <id>maven2-repository.dev.java.net</id> - <url>http://download.java.net/maven/2</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.9</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <optimize>true</optimize> - <compilerArgument>-Xlint:unchecked</compilerArgument> - </configuration> - </plugin> - <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespa-application-maven-plugin</artifactId> - <version>${vespa_version}</version> - <executions> - <execution> - <goals> - <goal>packageApplication</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <properties> - <test.hide>true</test.hide> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> -</project> diff --git a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/src/main/application/hosts.xml b/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/src/main/application/hosts.xml deleted file mode 100644 index 3ab86a21aef..00000000000 --- a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/src/main/application/hosts.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<hosts> - <host name="localhost"> - <alias>node1</alias> - </host> -</hosts> diff --git a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/src/main/application/package.json b/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/src/main/application/package.json deleted file mode 100755 index aab8330a58c..00000000000 --- a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/src/main/application/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "${artifactId}", - "version": "${version}", - "dependencies": { - "connect": ">=0.2.4" - }, -} diff --git a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/src/main/application/services.xml b/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/src/main/application/services.xml deleted file mode 100644 index a7ffb4446d5..00000000000 --- a/vespa_application_maven_archetype_plugin/src/main/resources/archetype-resources/src/main/application/services.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<services version="1.0"> - - <admin version="2.0"> - <adminserver hostalias="node1"/> - </admin> - - <search version="2.0"> - <qrservers> - <cluster name="default"> - <nodes> - <node hostalias="node1" /> - </nodes> - - <searchchains> - <searchchain id="default"> - <searcher id="${package}.ExampleSearcher"> - <config name="example"> - <message>Hello, world</message> - </config> - </searcher> - </searchchain> - </searchchains> - - </cluster> - </qrservers> - </search> - -</services> diff --git a/vespa_application_maven_archetype_plugin/src/test/resources/projects/basic/archetype.properties b/vespa_application_maven_archetype_plugin/src/test/resources/projects/basic/archetype.properties deleted file mode 100644 index c4510cfb2cd..00000000000 --- a/vespa_application_maven_archetype_plugin/src/test/resources/projects/basic/archetype.properties +++ /dev/null @@ -1,4 +0,0 @@ -version=6-SNAPSHOT -groupId=com.yahoo.vespa -artifactId=vespa-application-plugin -package=archetype.test
\ No newline at end of file diff --git a/vespa_application_maven_archetype_plugin/src/test/resources/projects/basic/goal.txt b/vespa_application_maven_archetype_plugin/src/test/resources/projects/basic/goal.txt deleted file mode 100644 index 1ab1a926ff0..00000000000 --- a/vespa_application_maven_archetype_plugin/src/test/resources/projects/basic/goal.txt +++ /dev/null @@ -1 +0,0 @@ -Create vespa application along with plugins for vespa container(e.g. searcher, docproc, handler). |