You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2016/08/25 16:33:44 UTC
[1/2] incubator-juneau git commit: Remove language-specific metadata
references from core metadata classes.
Repository: incubator-juneau
Updated Branches:
refs/heads/master 51bb3c48f -> 713d55402
Remove language-specific metadata references from core metadata classes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/d4f6cfa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/d4f6cfa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/d4f6cfa6
Branch: refs/heads/master
Commit: d4f6cfa659372e980aaab0b566484f0df2a3a695
Parents: 9c6eec7 69d11db
Author: jamesbognar <ja...@gmail.com>
Authored: Thu Aug 25 12:28:47 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Thu Aug 25 12:33:19 2016 -0400
----------------------------------------------------------------------
.../juneau/server/TestMessages.properties | 16 ++++
.../juneau/server/TestMessages2.properties | 16 ++++
.../org/apache/juneau/server/TestNls.properties | 79 ++++++++++++++++++++
.../juneau/server/TestNlsProperty.properties | 16 ++++
.../org/apache/juneau/server/xdocs/test.txt | 1 +
.../apache/juneau/server/xdocs/xdocs/test.txt | 1 +
6 files changed, 129 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d4f6cfa6/juneau-server-test/src/main/resources/org/apache/juneau/server/TestMessages.properties
----------------------------------------------------------------------
diff --cc juneau-server-test/src/main/resources/org/apache/juneau/server/TestMessages.properties
index 0000000,0000000..d107ee8
new file mode 100755
--- /dev/null
+++ b/juneau-server-test/src/main/resources/org/apache/juneau/server/TestMessages.properties
@@@ -1,0 -1,0 +1,16 @@@
++# ***************************************************************************************************************************
++# * 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. *
++# * *
++# ***************************************************************************************************************************
++
++key1 = value1a
++key2 = value2a
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d4f6cfa6/juneau-server-test/src/main/resources/org/apache/juneau/server/TestMessages2.properties
----------------------------------------------------------------------
diff --cc juneau-server-test/src/main/resources/org/apache/juneau/server/TestMessages2.properties
index 0000000,0000000..9a5fe73
new file mode 100755
--- /dev/null
+++ b/juneau-server-test/src/main/resources/org/apache/juneau/server/TestMessages2.properties
@@@ -1,0 -1,0 +1,16 @@@
++# ***************************************************************************************************************************
++# * 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. *
++# * *
++# ***************************************************************************************************************************
++
++key2 = value2b
++key3 = value3b
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d4f6cfa6/juneau-server-test/src/main/resources/org/apache/juneau/server/TestNls.properties
----------------------------------------------------------------------
diff --cc juneau-server-test/src/main/resources/org/apache/juneau/server/TestNls.properties
index 0000000,0000000..9833d00
new file mode 100755
--- /dev/null
+++ b/juneau-server-test/src/main/resources/org/apache/juneau/server/TestNls.properties
@@@ -1,0 -1,0 +1,79 @@@
++# ***************************************************************************************************************************
++# * 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. *
++# * *
++# ***************************************************************************************************************************
++
++label = Test2.a
++description = Test2.b
++test2 = Test2.c
++test2.req.attr.a = Test2.d
++test2.req.param.b = Test2.e
++test2.req.content = Test2.f
++test2.req.header.D = Test2.g
++test2.req.attr.a2 = Test2.h
++test2.req.param.b2 = Test2.i
++test2.req.header.D2 = Test2.j
++test2.req.foo.bar = Test2.k
++test2.res.200 = OK2
++test2.res.201 = Test2.l
++test2.res.201.foo.bar = Test2.m
++
++Test3.label = Test3.a
++Test3.description = Test3.b
++Test3.test3 = Test3.c
++Test3.test3.req.attr.a = Test3.d
++Test3.test3.req.param.b = Test3.e
++Test3.test3.req.content = Test3.f
++Test3.test3.req.header.D = Test3.g
++Test3.test3.req.attr.a2 = Test3.h
++Test3.test3.req.param.b2 = Test3.i
++Test3.test3.req.header.D2 = Test3.j
++Test3.test3.req.foo.bar = Test3.k
++Test3.test3.res.200 = OK3
++Test3.test3.res.201 = Test3.l
++Test3.test3.res.201.foo.bar = Test3.m
++
++Test4.label = $L{foo}
++Test4.description = $L{foo}
++Test4.test4 = $L{foo}
++Test4.test4.req.attr.a = $L{foo}
++Test4.test4.req.param.b = $L{foo}
++Test4.test4.req.content = $L{foo}
++Test4.test4.req.header.D = $L{foo}
++Test4.test4.req.attr.a2 = $L{foo}
++Test4.test4.req.param.b2 = $L{foo}
++Test4.test4.req.header.D2 = $L{foo}
++Test4.test4.req.foo.bar = $L{foo}
++Test4.test4.res.200 = foo$L{foo}foo$L{foo}foo
++Test4.test4.res.201 = $L{foo}
++Test4.test4.res.201.foo.bar = $L{foo}
++
++foo = $L{bar}
++bar = baz
++
++Test5.label = $L{foo2}
++Test5.description = $R{servletLabel}
++Test5.test5 = $R{servletLabel}
++Test5.test5.req.attr.a = $R{servletLabel}
++Test5.test5.req.param.b = $R{servletLabel}
++Test5.test5.req.content = $R{servletLabel}
++Test5.test5.req.header.D = $R{servletLabel}
++Test5.test5.req.attr.a2 = $R{servletLabel}
++Test5.test5.req.param.b2 = $R{servletLabel}
++Test5.test5.req.header.D2 = $R{servletLabel}
++Test5.test5.req.foo.bar = $R{servletLabel}
++Test5.test5.res.200 = foo$R{servletLabel}foo$R{servletLabel}foo
++Test5.test5.res.201 = $R{servletLabel}
++Test5.test5.res.201.foo.bar = $R{servletLabel}
++Test5.foo2 = $L{bar2}
++Test5.bar2 = baz2
++
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d4f6cfa6/juneau-server-test/src/main/resources/org/apache/juneau/server/TestNlsProperty.properties
----------------------------------------------------------------------
diff --cc juneau-server-test/src/main/resources/org/apache/juneau/server/TestNlsProperty.properties
index 0000000,0000000..a833256
new file mode 100755
--- /dev/null
+++ b/juneau-server-test/src/main/resources/org/apache/juneau/server/TestNlsProperty.properties
@@@ -1,0 -1,0 +1,16 @@@
++# ***************************************************************************************************************************
++# * 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. *
++# * *
++# ***************************************************************************************************************************
++
++key1 = value1
++key2 = value2
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d4f6cfa6/juneau-server-test/src/main/resources/org/apache/juneau/server/xdocs/test.txt
----------------------------------------------------------------------
diff --cc juneau-server-test/src/main/resources/org/apache/juneau/server/xdocs/test.txt
index 0000000,0000000..17116ed
new file mode 100755
--- /dev/null
+++ b/juneau-server-test/src/main/resources/org/apache/juneau/server/xdocs/test.txt
@@@ -1,0 -1,0 +1,1 @@@
++OK-1
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d4f6cfa6/juneau-server-test/src/main/resources/org/apache/juneau/server/xdocs/xdocs/test.txt
----------------------------------------------------------------------
diff --cc juneau-server-test/src/main/resources/org/apache/juneau/server/xdocs/xdocs/test.txt
index 0000000,0000000..0e35120
new file mode 100755
--- /dev/null
+++ b/juneau-server-test/src/main/resources/org/apache/juneau/server/xdocs/xdocs/test.txt
@@@ -1,0 -1,0 +1,1 @@@
++OK-2
[2/2] incubator-juneau git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-juneau.git
Posted by ja...@apache.org.
Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-juneau.git
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/713d5540
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/713d5540
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/713d5540
Branch: refs/heads/master
Commit: 713d55402333bddf8bbd1872151b13dc634b137b
Parents: d4f6cfa 51bb3c4
Author: jamesbognar <ja...@gmail.com>
Authored: Thu Aug 25 12:33:31 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Thu Aug 25 12:33:42 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------