summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2017-01-16 16:04:40 +0100
committerGitHub <noreply@github.com>2017-01-16 16:04:40 +0100
commit537380f035c2994d5f8c3efe3fece50ef59ce229 (patch)
tree4867c8ae609708b6705b0a5d3234f82f606d6d14
parent1ed3adbf930b6308590311a09a35c43dfc6a808b (diff)
parent9f7694f2bbd91f93591779c75ed7abbbb3512ba9 (diff)
Merge pull request #1516 from yahoo/kkraune/move-files
Move files to com.yahoo.example
-rw-r--r--sample-apps/basic-search-java/src/main/application/services.xml2
-rw-r--r--sample-apps/basic-search-java/src/main/java/com/yahoo/example/ExampleProcessor.java (renamed from sample-apps/basic-search-java/src/main/java/ExampleProcessor.java)3
-rw-r--r--sample-apps/basic-search-java/src/main/java/com/yahoo/example/StringData.java (renamed from sample-apps/basic-search-java/src/main/java/StringData.java)2
-rw-r--r--sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationMain.java (renamed from sample-apps/basic-search-java/src/test/java/ApplicationMain.java)2
-rw-r--r--sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationTest.java (renamed from sample-apps/basic-search-java/src/test/java/ApplicationTest.java)2
-rw-r--r--sample-apps/basic-search-java/src/test/java/com/yahoo/example/ExampleProcessorTest.java (renamed from sample-apps/basic-search-java/src/test/java/ExampleProcessorTest.java)3
6 files changed, 6 insertions, 8 deletions
diff --git a/sample-apps/basic-search-java/src/main/application/services.xml b/sample-apps/basic-search-java/src/main/application/services.xml
index b740100e0dd..95c4ee15f7d 100644
--- a/sample-apps/basic-search-java/src/main/application/services.xml
+++ b/sample-apps/basic-search-java/src/main/application/services.xml
@@ -7,7 +7,7 @@
<jdisc version="1.0">
<processing>
<chain id="default">
- <processor id="ExampleProcessor" bundle="basic-search-java">
+ <processor id="com.yahoo.example.ExampleProcessor" bundle="basic-search-java">
<config name="example.example-processor">
<message>Hello, services!</message>
</config>
diff --git a/sample-apps/basic-search-java/src/main/java/ExampleProcessor.java b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/ExampleProcessor.java
index 1c29c479190..228f6a71b77 100644
--- a/sample-apps/basic-search-java/src/main/java/ExampleProcessor.java
+++ b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/ExampleProcessor.java
@@ -1,8 +1,7 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-//package com.yahoo.example;
+package com.yahoo.example;
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;
diff --git a/sample-apps/basic-search-java/src/main/java/StringData.java b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/StringData.java
index 37519c82f44..0bff013ab78 100644
--- a/sample-apps/basic-search-java/src/main/java/StringData.java
+++ b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/StringData.java
@@ -1,5 +1,5 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-//package ${package};
+package com.yahoo.example;
import com.yahoo.processing.Request;
import com.yahoo.processing.response.AbstractData;
diff --git a/sample-apps/basic-search-java/src/test/java/ApplicationMain.java b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationMain.java
index 620e12f4277..da85e486602 100644
--- a/sample-apps/basic-search-java/src/test/java/ApplicationMain.java
+++ b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationMain.java
@@ -1,5 +1,5 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-//package ${package};
+package com.yahoo.example;
import com.yahoo.application.Networking;
import org.junit.Test;
diff --git a/sample-apps/basic-search-java/src/test/java/ApplicationTest.java b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationTest.java
index 5cf5b62c261..943a46c9f0b 100644
--- a/sample-apps/basic-search-java/src/test/java/ApplicationTest.java
+++ b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationTest.java
@@ -1,5 +1,5 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-//package ${package};
+package com.yahoo.example;
import com.yahoo.application.Application;
import com.yahoo.application.Networking;
diff --git a/sample-apps/basic-search-java/src/test/java/ExampleProcessorTest.java b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ExampleProcessorTest.java
index 447ae9ff6d2..4aa03c4ed12 100644
--- a/sample-apps/basic-search-java/src/test/java/ExampleProcessorTest.java
+++ b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ExampleProcessorTest.java
@@ -1,8 +1,7 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-//package ${package};
+package com.yahoo.example;
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;