You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2011/10/26 10:38:36 UTC
svn commit: r1189074 - in /incubator/isis/trunk/framework: ./
core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/
runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/i...
Author: kevin
Date: Wed Oct 26 08:38:35 2011
New Revision: 1189074
URL: http://svn.apache.org/viewvc?rev=1189074&view=rev
Log:
ISIS-125: Preparing for next release.
Modified:
incubator/isis/trunk/framework/addmissinglicenses.groovy
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/installer/JdbcFieldMappingFactoryInstaller.java
incubator/isis/trunk/framework/security/sql/src/test/java/org/apache/isis/security/sql/authentication/SqlAuthenticatorTest.java
incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
incubator/isis/trunk/framework/viewer/json/src/site/apt/index.apt
incubator/isis/trunk/framework/viewer/xhtml/src/site/apt/index.apt
Modified: incubator/isis/trunk/framework/addmissinglicenses.groovy
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/addmissinglicenses.groovy?rev=1189074&r1=1189073&r2=1189074&view=diff
==============================================================================
--- incubator/isis/trunk/framework/addmissinglicenses.groovy (original)
+++ incubator/isis/trunk/framework/addmissinglicenses.groovy Wed Oct 26 08:38:35 2011
@@ -105,7 +105,7 @@ REM under the License.
"""
-def fileEndings = [".htm"]
+def fileEndings = [".java", ".htm"]
//def fileEndings = [".xml", ".html", ".htm", ".shtml", ".css", ".java", ".sh", ".properties", ".groovy", ".allow", ".passwords", ".bat"]
def licenseTextByFileEnding = [
@@ -153,7 +153,10 @@ currentDir.eachFileRecurse { file ->
file.write(licenseTextByFileEnding[fileEnding])
file.append(fileText)
}
- }
+
+ } else {
+ // println "Y: "+ file.canonicalPath
+ }
}
}
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java?rev=1189074&r1=1189073&r2=1189074&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java Wed Oct 26 08:38:35 2011
@@ -102,8 +102,7 @@ public abstract class BooleanValueSemant
case 'f':
return Boolean.FALSE;
default:
- throw new IsisException("Invalid data for logical, expected 'T', 'F' or 'N, but got "
- + data.charAt(0));
+ throw new IsisException("Invalid data for logical, expected 't' or 'f', but got " + data.charAt(0));
}
}
throw new IsisException("Invalid data for logical, expected 1, 4 or 5 bytes, got " + dataLength + ": " + data);
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/installer/JdbcFieldMappingFactoryInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/installer/JdbcFieldMappingFactoryInstaller.java?rev=1189074&r1=1189073&r2=1189074&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/installer/JdbcFieldMappingFactoryInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/installer/JdbcFieldMappingFactoryInstaller.java Wed Oct 26 08:38:35 2011
@@ -45,7 +45,7 @@ public class JdbcFieldMappingFactoryInst
@Override
public void load(final FieldMappingLookup lookup) {
- lookup.addFieldMappingFactory(boolean.class, new JdbcBinaryValueMapper.Factory(Defaults.TYPE_BOOLEAN()));
+ lookup.addFieldMappingFactory(Boolean.class, new JdbcBinaryValueMapper.Factory(Defaults.TYPE_BOOLEAN()));
lookup.addFieldMappingFactory(short.class, new JdbcBinaryValueMapper.Factory(Defaults.TYPE_SHORT()));
lookup.addFieldMappingFactory(int.class, new JdbcBinaryValueMapper.Factory(Defaults.TYPE_INT()));
lookup.addFieldMappingFactory(long.class, new JdbcBinaryValueMapper.Factory(Defaults.TYPE_LONG()));
Modified: incubator/isis/trunk/framework/security/sql/src/test/java/org/apache/isis/security/sql/authentication/SqlAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/security/sql/src/test/java/org/apache/isis/security/sql/authentication/SqlAuthenticatorTest.java?rev=1189074&r1=1189073&r2=1189074&view=diff
==============================================================================
--- incubator/isis/trunk/framework/security/sql/src/test/java/org/apache/isis/security/sql/authentication/SqlAuthenticatorTest.java (original)
+++ incubator/isis/trunk/framework/security/sql/src/test/java/org/apache/isis/security/sql/authentication/SqlAuthenticatorTest.java Wed Oct 26 08:38:35 2011
@@ -1,3 +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 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.isis.security.sql.authentication;
import java.util.Properties;
Modified: incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml?rev=1189074&r1=1189073&r2=1189074&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml (original)
+++ incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml Wed Oct 26 08:38:35 2011
@@ -792,6 +792,13 @@ done</programlisting>
<para>This takes a little longer to run, but is at least
repeatable.</para>
+
+ <sect3>
+ <title id="sec.build.modules">"Modules" file</title>
+
+ <para>The "modules" resource is manually edited, any new projects
+ or modules must be added manually.</para>
+ </sect3>
</sect2>
<sect2>
@@ -3634,7 +3641,8 @@ public class FooBar {
</listitem>
<listitem>
- <para>site builds ok (<code>sh msdf.sh -o</code>)</para>
+ <para>site builds ok (<code>sh msdf.sh -o</code>), see <xref
+ linkend="sec.build.modules" />.</para>
</listitem>
<listitem>
@@ -3818,6 +3826,16 @@ public class FooBar {
</itemizedlist>
<para>Investigate and fix any reported violations.</para>
+
+ <para>You can use the groovy script "addmissinglicenses.groovy" to
+ automatically insert missing copyright headers:</para>
+
+ <para><programlisting>groovy addmissinglicenses.groovy</programlisting></para>
+
+ <para>The actual files checked are those with extensions specified
+ in the line:</para>
+
+ <para><programlisting>def fileEndings = [".java", ".htm"]</programlisting></para>
</sect2>
<sect2>
Modified: incubator/isis/trunk/framework/viewer/json/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/src/site/apt/index.apt?rev=1189074&r1=1189073&r2=1189074&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/framework/viewer/json/src/site/apt/index.apt Wed Oct 26 08:38:35 2011
@@ -31,7 +31,7 @@ JSON Viewer
Further Info
- See this module's {{{./apidocs/index.html}Javadoc}} and the
+ See this module's {{{./json-applib/index.html}applib}}, {{{./json-viewer/index.html}viewer}} and
{{{./docbkx/html/guide/isis-json-viewer.html}user guide}} for more information.
See also
Modified: incubator/isis/trunk/framework/viewer/xhtml/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/xhtml/src/site/apt/index.apt?rev=1189074&r1=1189073&r2=1189074&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/xhtml/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/framework/viewer/xhtml/src/site/apt/index.apt Wed Oct 26 08:38:35 2011
@@ -49,7 +49,9 @@ Representation
Further Info
- See this module's {{{./apidocs/index.html}Javadoc}} and the {{{./docbkx/html/guide/isis-xhtml-viewer.html}user guide}} for more information.
+ See this module's {{{./xhtml-applib/index.html}applib}}, {{{./xhtml-viewer/index.html}viewer}} and
+ {{{./docbkx/html/guide/isis-xhtml-viewer.html}user guide}} for more information.
+
See also