You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/04/12 08:32:27 UTC
[1/4] cayenne git commit: wrong comment line in
cayennemodeler-strings.properties. Unfortunately Java properties file only
have single line # comments. It will not support single(//) and
multi-line(/**/) comments.
Repository: cayenne
Updated Branches:
refs/heads/master c9c7cbed6 -> 35833cde0
wrong comment line in cayennemodeler-strings.properties. Unfortunately Java properties file only have single line # comments. It will not support single(//) and multi-line(/**/) comments.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8403df69
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8403df69
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8403df69
Branch: refs/heads/master
Commit: 8403df6944fc79aa51953c6ad2cb3a43ecded7ed
Parents: c9c7cbe
Author: sarvaratchagan <sa...@outlook.com>
Authored: Wed Apr 12 08:47:07 2017 +0530
Committer: sarvaratchagan <sa...@outlook.com>
Committed: Wed Apr 12 08:47:07 2017 +0530
----------------------------------------------------------------------
.../modeler/cayennemodeler-strings.properties | 51 ++++++++++----------
1 file changed, 25 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8403df69/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties
index 3ac1d27..0b82151 100644
--- a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties
+++ b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties
@@ -1,19 +1,19 @@
-// 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.
cayenne.bugreport.url = http://issues.apache.org/jira/browse/CAY
@@ -21,7 +21,7 @@ cayenne.modeler.about.info = (c) 2001-2016 Apache Software Foundation and indivi
<br><br>http://cayenne.apache.org/<br>
-// "New Project" dialog.
+# "New Project" dialog.
cayenne.modeler.project.cancel.button = Close
cayenne.modeler.project.cancel.button.ShortDescription = Do not create project
@@ -32,7 +32,7 @@ cayenne.modeler.project.app.desc = Cayenne application project should be used fo
applications. It consists of "cayenne.xml" file and a set of linked DataMaps and DataNodes. \
There can be only one "cayenne.xml" in any Java application. If you are creating a Cayenne-\
based shared library or framework, use Data Map project instead.
-
+
cayenne.modeler.project.map.name = Cayenne DataMap Project
cayenne.modeler.project.map.button = Create DataMap
cayenne.modeler.project.map.button.ShortDescription = Create new DataMap project
@@ -42,7 +42,7 @@ cayenne.modeler.project.map.desc = DataMap project is a single DataMap that desc
projects that provide needed connection information.
-// "Generate Classes" Dialog
+# "Generate Classes" Dialog
cayenne.modeler.classgenerator.selectall.button = Select All
cayenne.modeler.classgenerator.selectall.button.ShortDescription = Select All Classes
@@ -61,14 +61,14 @@ cayenne.modeler.classgenerator.choosetemplate.button.ShortDescription = Select C
cayenne.modeler.classgenerator.choosesupertemplate.button = Select
cayenne.modeler.classgenerator.choosesupertemplate.button.ShortDescription = Select Custom Superclass Template
-// DbEntityValidation Dialog
+# DbEntityValidation Dialog
cayenne.modeler.dbentityvalidation.generateopts.button = Continue
cayenne.modeler.dbentityvalidation.generateopts.button.ShortDescription = Continue With DB Schema Generation
cayenne.modeler.dbentityvalidation.cancel.button = Cancel
cayenne.modeler.dbentityvalidation.cancel.button.ShortDescription = Cancel DB Schema Generation
-// CacheSyncConfig Dialog
+# CacheSyncConfig Dialog
cayenne.modeler.cacheSyncConfig.save.button = Done
cayenne.modeler.cacheSyncConfig.save.button.ShortDescription =Done
cayenne.modeler.cacheSyncConfig.cancel.button = Cancel
@@ -77,7 +77,7 @@ cayenne.modeler.cacheSyncConfig.cancel.button.ShortDescription = Cancel
cayenne.modeler.jgroupConfig.radio1 = Standard Configuration
cayenne.modeler.jgroupConfig.radio2 = Use Configuration File
-// ConfigureClasspath Dialog
+# ConfigureClasspath Dialog
cayenne.modeler.configClasspath.save.button = Done
cayenne.modeler.configClasspath.save.button.ShortDescription = Done
cayenne.modeler.configClasspath.cancel.button = Cancel
@@ -90,7 +90,7 @@ cayenne.modeler.configClasspath.adddir.button.ShortDescription = Add Class Folde
cayenne.modeler.configClasspath.remove.button = Remove
cayenne.modeler.configClasspath.remove.button.ShortDescription = Remove
-// ObjRelationshipInfo Dialog
+# ObjRelationshipInfo Dialog
cayenne.modeler.mapObjRelationship.save.button = Done
cayenne.modeler.mapObjRelationship.save.button.ShortDescription = Done
cayenne.modeler.mapObjRelationship.cancel.button = Cancel
@@ -111,7 +111,7 @@ cayenne.modeler.mapObjRelationship.clear.path.button.ShortDescription = Clear Pa
cayenne.modeler.mapObjRelationship.source1.button =
cayenne.modeler.mapObjRelationship.source2.button =
-// QueryType Dialog
+# QueryType Dialog
cayenne.modeler.queryType.create.button = Create
cayenne.modeler.queryType.create.button.ShortDescription = Create
@@ -130,7 +130,7 @@ cayenne.modeler.queryType.procedureQuery.radio.ShortDescription = Stored Procedu
cayenne.modeler.queryType.ejbqlQuery.radio = EJBQL Query
cayenne.modeler.queryType.ejbqlQuery.radio.ShortDescription = EJBQL Query
-// DataMap DefaultsPreferences Dialog
+# DataMap DefaultsPreferences Dialog
cayenne.modeler.datamap.defaultprefs.update.button = Update
cayenne.modeler.datamap.defaultprefs.update.button.ShortDescription = Update
@@ -148,4 +148,3 @@ cayenne.modeler.datamap.defaultprefs.superclassnull.radio = Do not override exis
cayenne.modeler.datamap.defaultprefs.locktype.radio = Set/update lock type for all ObjEntities
cayenne.modeler.datamap.defaultprefs.locktypenull.radio = Do not override optimistic locking settings
-
[2/4] cayenne git commit: license missing
Posted by nt...@apache.org.
license missing
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/115b1387
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/115b1387
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/115b1387
Branch: refs/heads/master
Commit: 115b13874d7fa46149af46a0923bba1f929d7d9b
Parents: 8403df6
Author: sarvaratchagan <sa...@outlook.com>
Authored: Wed Apr 12 08:48:48 2017 +0530
Committer: sarvaratchagan <sa...@outlook.com>
Committed: Wed Apr 12 08:48:48 2017 +0530
----------------------------------------------------------------------
.../src/main/resources/pref/HSQLNode.driver.xml | 18 ++++++++++++++++++
.../resources/pref/ModelerPreferences.map.xml | 18 ++++++++++++++++++
.../src/main/resources/pref/Preferences.map.xml | 18 ++++++++++++++++++
.../src/main/resources/pref/cayenne.xml | 18 ++++++++++++++++++
4 files changed, 72 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/115b1387/modeler/cayenne-modeler/src/main/resources/pref/HSQLNode.driver.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/pref/HSQLNode.driver.xml b/modeler/cayenne-modeler/src/main/resources/pref/HSQLNode.driver.xml
index 0dc18ac..ebda77b 100644
--- a/modeler/cayenne-modeler/src/main/resources/pref/HSQLNode.driver.xml
+++ b/modeler/cayenne-modeler/src/main/resources/pref/HSQLNode.driver.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
<driver project-version="3.0.0.1" class="org.hsqldb.jdbcDriver">
<connectionPool min="1" max="1"/>
<login userName="sa"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/115b1387/modeler/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml b/modeler/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml
index ba08913..a794d7a 100644
--- a/modeler/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml
+++ b/modeler/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/115b1387/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml b/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml
index 1011c91..3ab3050 100644
--- a/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml
+++ b/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/115b1387/modeler/cayenne-modeler/src/main/resources/pref/cayenne.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/pref/cayenne.xml b/modeler/cayenne-modeler/src/main/resources/pref/cayenne.xml
index 9ff5961..5ca927c 100644
--- a/modeler/cayenne-modeler/src/main/resources/pref/cayenne.xml
+++ b/modeler/cayenne-modeler/src/main/resources/pref/cayenne.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
<domains project-version="3.0.0.1">
<domain name="CayenneModelerPreferences">
<property name="cayenne.DataRowStore.snapshot.size" value="1000"/>
[3/4] cayenne git commit: Load application resource when the class is
loaded in the memory
Posted by nt...@apache.org.
Load application resource when the class is loaded in the memory
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cdf7144b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cdf7144b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cdf7144b
Branch: refs/heads/master
Commit: cdf7144b5a4d716271bc0cfab1b9618f86c33686
Parents: 115b138
Author: sarvaratchagan <sa...@outlook.com>
Authored: Wed Apr 12 08:52:29 2017 +0530
Committer: sarvaratchagan <sa...@outlook.com>
Committed: Wed Apr 12 08:52:29 2017 +0530
----------------------------------------------------------------------
.../org/apache/cayenne/util/LocalizedStringsHandler.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cdf7144b/cayenne-server/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java b/cayenne-server/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java
index dc7783e..2e60c56 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java
@@ -32,16 +32,21 @@ public class LocalizedStringsHandler {
protected static ResourceBundle bundle;
+ static {
+ // "static constructor"
+ bundle = getBundle();
+ }
+
/**
* Returns localized string for the given key.
*/
public static String getString(String key) {
- if (getBundle() == null) {
+ if ( bundle == null ) {
return "";
}
try {
- return getBundle().getString(key);
+ return bundle.getString(key);
} catch (Throwable e) {
return "";
}
@@ -59,4 +64,4 @@ public class LocalizedStringsHandler {
}
return bundle;
}
-}
+}
\ No newline at end of file
[4/4] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/194' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/194' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/35833cde
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/35833cde
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/35833cde
Branch: refs/heads/master
Commit: 35833cde0a6c3ffe3b80ff9bc5c0a0bd31b95df4
Parents: c9c7cbe cdf7144
Author: stariy <st...@gmail.com>
Authored: Wed Apr 12 11:27:03 2017 +0300
Committer: stariy <st...@gmail.com>
Committed: Wed Apr 12 11:27:03 2017 +0300
----------------------------------------------------------------------
.../cayenne/util/LocalizedStringsHandler.java | 11 +++--
.../modeler/cayennemodeler-strings.properties | 51 ++++++++++----------
.../src/main/resources/pref/HSQLNode.driver.xml | 18 +++++++
.../resources/pref/ModelerPreferences.map.xml | 18 +++++++
.../src/main/resources/pref/Preferences.map.xml | 18 +++++++
.../src/main/resources/pref/cayenne.xml | 18 +++++++
6 files changed, 105 insertions(+), 29 deletions(-)
----------------------------------------------------------------------