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/08/16 15:44:04 UTC
cayenne git commit: CAY-2345 Own template renderer as a replacement
for Velocity - missing class after merge - release and upgrade notes
Repository: cayenne
Updated Branches:
refs/heads/master d249aa37d -> 50801e66d
CAY-2345 Own template renderer as a replacement for Velocity
- missing class after merge
- release and upgrade notes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/50801e66
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/50801e66
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/50801e66
Branch: refs/heads/master
Commit: 50801e66d3072e5cd6b6e2d7a9915c293d969685
Parents: d249aa3
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Aug 16 18:43:58 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Aug 16 18:43:58 2017 +0300
----------------------------------------------------------------------
.../cayenne/template/parser/IdentifierNode.java | 41 ++++++++++++++++++++
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
docs/doc/src/main/resources/UPGRADE.txt | 5 +++
3 files changed, 47 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/50801e66/cayenne-server/src/main/java/org/apache/cayenne/template/parser/IdentifierNode.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/template/parser/IdentifierNode.java b/cayenne-server/src/main/java/org/apache/cayenne/template/parser/IdentifierNode.java
new file mode 100644
index 0000000..c93167f
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/template/parser/IdentifierNode.java
@@ -0,0 +1,41 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+
+package org.apache.cayenne.template.parser;
+
+/**
+ * @since 4.1
+ */
+public abstract class IdentifierNode extends SimpleNode {
+
+ private String identifier;
+
+ public IdentifierNode(int i) {
+ super(i);
+ }
+
+ public void setIdentifier(String identifier) {
+ this.identifier = identifier;
+ }
+
+ public String getIdentifier() {
+ return identifier;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/50801e66/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index 4141da3..48cfa84 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -19,6 +19,7 @@ CAY-2330 Field based data objects
CAY-2335 New XML loading/saving mechanics with support of plugable handlers
CAY-2336 Support for comments in Modeler
CAY-2339 Compatibility module to support old versions of projects at runtime
+CAY-2345 Own template renderer as a replacement for Velocity
CAY-2346 Field-based data object with Map-based storage fallback
Bug Fixes:
http://git-wip-us.apache.org/repos/asf/cayenne/blob/50801e66/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt
index ddc72e4..942e473 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -7,6 +7,11 @@ IMPORTANT: be sure to read all notes for the intermediate releases between your
UPGRADING TO 4.1.M1
+* Per CAY-2345 Velocity replaced with Cayenne own template engine by default in cayenne-server,
+ this should be transparent in almost all cases, however if you relied on advanced Velocity
+ features in SQLTemplate you can include auto-loaded cayenne-velocity module and keep using Velocity,
+ no other actions required.
+
* Per CAY-2335 ServerRuntime by default will fail to load projects in case of version mismatch.
You have two options:
- update project via opening it in Cayenne Modeler