You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2016/02/14 21:43:48 UTC
incubator-tamaya git commit: TAMAYA-139 Renamed properties file with
version information.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master c8ff387e2 -> a147301bb
TAMAYA-139 Renamed properties file with version information.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/a147301b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/a147301b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/a147301b
Branch: refs/heads/master
Commit: a147301bb55735ae01a02f0c9aa088b13e6e287a
Parents: c8ff387
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Sun Feb 14 21:43:13 2016 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Sun Feb 14 21:43:43 2016 +0100
----------------------------------------------------------------------
.../tamaya/server/ConfigurationResource.java | 1 -
.../apache/tamaya/server/VersionProperties.java | 2 +-
.../META-INF/server-version.properties | 22 --------------------
.../META-INF/tamaya-server-version.properties | 22 ++++++++++++++++++++
.../main/resources/server-version.properties | 22 --------------------
.../tamaya/server/VersionPropertiesTest.java | 2 +-
6 files changed, 24 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a147301b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
index 0a279fb..f239e5c 100644
--- a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
+++ b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
@@ -64,7 +64,6 @@ public class ConfigurationResource {
@Path("/version")
@Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public String version() {
- // TODO TAMAYA-139: make version string dynamically calculated based on mvn settings
String product = VersionProperties.getProduct().replace("\"", "\\\"");
String version = VersionProperties.getVersion().replace("\"", "\\\"");
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a147301b/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java b/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
index 1e04e8b..e6136fb 100644
--- a/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
+++ b/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
@@ -30,7 +30,7 @@ import java.util.Properties;
* {@value #VERSION_PROPERTY_FILE}.</p>
*/
public class VersionProperties {
- private static final String VERSION_PROPERTY_FILE = "/META-INF/server-version.properties";
+ private static final String VERSION_PROPERTY_FILE = "/META-INF/tamaya-server-version.properties";
static {
try (InputStream resource = VersionProperties.class.getResourceAsStream(VERSION_PROPERTY_FILE)) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a147301b/modules/server/src/main/resources/META-INF/server-version.properties
----------------------------------------------------------------------
diff --git a/modules/server/src/main/resources/META-INF/server-version.properties b/modules/server/src/main/resources/META-INF/server-version.properties
deleted file mode 100644
index ef0ca70..0000000
--- a/modules/server/src/main/resources/META-INF/server-version.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#
-# 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 current 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.
-#
-
-server.product=Apache Tamaya
-server.version=${project.version}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a147301b/modules/server/src/main/resources/META-INF/tamaya-server-version.properties
----------------------------------------------------------------------
diff --git a/modules/server/src/main/resources/META-INF/tamaya-server-version.properties b/modules/server/src/main/resources/META-INF/tamaya-server-version.properties
new file mode 100644
index 0000000..ef0ca70
--- /dev/null
+++ b/modules/server/src/main/resources/META-INF/tamaya-server-version.properties
@@ -0,0 +1,22 @@
+
+#
+# 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 current 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.
+#
+
+server.product=Apache Tamaya
+server.version=${project.version}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a147301b/modules/server/src/main/resources/server-version.properties
----------------------------------------------------------------------
diff --git a/modules/server/src/main/resources/server-version.properties b/modules/server/src/main/resources/server-version.properties
deleted file mode 100644
index ef0ca70..0000000
--- a/modules/server/src/main/resources/server-version.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#
-# 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 current 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.
-#
-
-server.product=Apache Tamaya
-server.version=${project.version}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a147301b/modules/server/src/test/java/org/apache/tamaya/server/VersionPropertiesTest.java
----------------------------------------------------------------------
diff --git a/modules/server/src/test/java/org/apache/tamaya/server/VersionPropertiesTest.java b/modules/server/src/test/java/org/apache/tamaya/server/VersionPropertiesTest.java
index 8e1b79d..18bc0ba 100644
--- a/modules/server/src/test/java/org/apache/tamaya/server/VersionPropertiesTest.java
+++ b/modules/server/src/test/java/org/apache/tamaya/server/VersionPropertiesTest.java
@@ -33,7 +33,7 @@ public class VersionPropertiesTest {
@Test
public void correctVersionPropertiesAreReadAndSet() throws IOException {
- InputStream resource = VersionProperties.class.getResourceAsStream("/META-INF/server-version.properties");
+ InputStream resource = VersionProperties.class.getResourceAsStream("/META-INF/tamaya-server-version.properties");
Properties properties = new Properties();
properties.load(resource);