On 23 May 2015 at 10:44, <rj...@apache.org> wrote: > Author: rjung > Date: Sat May 23 09:44:41 2015 > New Revision: 1681300 > > URL: http://svn.apache.org/r1681300 > Log: > Make tcnative trunk more consistent with 1.1 branch: > > - use externals for jni Java classes, but here > pointing to TC trunk > > - remove download and copy targets for jni > Java classes in build script > > - add Apr.java and apr.properties from 1.1a > > In addition: > - use Java 8 in trunk
Is Java 8 really necessary? If so README.txt needs to be updated. > - expect next version to be 1.2 instead of 2.0 > > Added: > tomcat/native/trunk/java/ > tomcat/native/trunk/java/org/ > tomcat/native/trunk/java/org/apache/ > tomcat/native/trunk/java/org/apache/tomcat/ (with props) > tomcat/native/trunk/java/org/apache/tomcat/Apr.java (with props) > tomcat/native/trunk/java/org/apache/tomcat/apr.properties (with props) > Modified: > tomcat/native/trunk/build.properties.default > tomcat/native/trunk/build.xml > > Modified: tomcat/native/trunk/build.properties.default > URL: > http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=1681300&r1=1681299&r2=1681300&view=diff > ============================================================================== > --- tomcat/native/trunk/build.properties.default (original) > +++ tomcat/native/trunk/build.properties.default Sat May 23 09:44:41 2015 > @@ -16,8 +16,8 @@ > # > > # ----- Version Control Flags ----- > -version.major=2 > -version.minor=0 > +version.major=1 > +version.minor=2 > version.build=0 > version.patch=0 > version.suffix=-dev > @@ -30,8 +30,8 @@ base.path=/usr/share/java > #base.path=C:/path/to/the/repository > #base.path=/usr/local > > -compile.source=1.4 > -compile.target=1.4 > +compile.source=1.8 > +compile.target=1.8 > compile.debug=off > compile.deprecation=on > compile.optimize=on > @@ -39,16 +39,6 @@ compile.optimize=on > base-tomcat.loc=http://archive.apache.org/dist/tomcat > base-sf.loc=http://downloads.sourceforge.net > > -# ----- Tomcat native Java sources ----- > -# The Tomcat 6 version we use for getting the Java sources > -tomcat.version=6.0.20 > -# The directory containing your source distribution of Tomcat > -# It will be automatically downloaded if it doesn't exist > -tomcat.src=${base.path}/apache-tomcat-${tomcat.version}-src > -#tomcat.src=/usr/local/apache-tomcat-${tomcat.version}-src > -# The URL used to download Tomcat if needed > -tomcat.loc=${base-tomcat.loc}/tomcat-6/v${tomcat.version}/src/apache-tomcat-${tomcat.version}-src.tar.gz > - > # ----- JUnit Unit Test Suite, version 3.8 or later ----- > # The JUnit version we will use > junit.version=3.8.2 > > Modified: tomcat/native/trunk/build.xml > URL: > http://svn.apache.org/viewvc/tomcat/native/trunk/build.xml?rev=1681300&r1=1681299&r2=1681300&view=diff > ============================================================================== > --- tomcat/native/trunk/build.xml (original) > +++ tomcat/native/trunk/build.xml Sat May 23 09:44:41 2015 > @@ -31,8 +31,8 @@ > <property name="name" value="Tomcat Native" /> > <property name="title" value="Tomcat Native Library"/> > <property name="year" value="2015" /> > - <property name="version.major" value="2" /> > - <property name="version.minor" value="0" /> > + <property name="version.major" value="1" /> > + <property name="version.minor" value="2" /> > <property name="version.build" value="0" /> > <property name="version.patch" value="0" /> > <property name="version.suffix" value="-dev" /> > @@ -54,8 +54,8 @@ > <property name="dist.root" value="./dist"/> > <property name="ant.home" value="."/> > > - <property name="compile.source" value="1.4"/> > - <property name="compile.target" value="1.4"/> > + <property name="compile.source" value="1.8"/> > + <property name="compile.target" value="1.8"/> > <property name="compile.debug" value="off"/> > <property name="compile.optimize" value="on"/> > <property name="compile.deprecation" value="on"/> > @@ -153,10 +153,6 @@ > <target name="download" description="Download needed dependencies"> > > <mkdir dir="${base.path}"/> > - <antcall target="downloadgz"> > - <param name="sourcefile" value="${tomcat.loc}"/> > - <param name="destfile" value="${tomcat.src}"/> > - </antcall> > > <antcall target="downloadzip"> > <param name="sourcefile" value="${junit.loc}"/> > @@ -215,12 +211,6 @@ limitations under the License.-->"> > <format property="TODAY" pattern="MMM d yyyy" locale="en"/> > <format property="TSTAMP" pattern="hh:mm:ss"/> > </tstamp> > - <!-- Copy Java sources from Tomcat source download --> > - <copy todir="${src.dir}/java" preservelastmodified="true"> > - <fileset > dir="${base.path}/apache-tomcat-${tomcat.version}-src/java"> > - <include name="org/apache/tomcat/jni/"/> > - </fileset> > - </copy> > <!-- Copy static resource files --> > <filter token="VERSION" value="${version}"/> > <filter token="VERSION_NUMBER" value="${version.number}"/> > > Propchange: tomcat/native/trunk/java/org/apache/tomcat/ > ------------------------------------------------------------------------------ > --- svn:externals (added) > +++ svn:externals Sat May 23 09:44:41 2015 > @@ -0,0 +1 @@ > +^/tomcat/trunk/java/org/apache/tomcat/jni@1678592 jni > > Added: tomcat/native/trunk/java/org/apache/tomcat/Apr.java > URL: > http://svn.apache.org/viewvc/tomcat/native/trunk/java/org/apache/tomcat/Apr.java?rev=1681300&view=auto > ============================================================================== > --- tomcat/native/trunk/java/org/apache/tomcat/Apr.java (added) > +++ tomcat/native/trunk/java/org/apache/tomcat/Apr.java Sat May 23 09:44:41 > 2015 > @@ -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.tomcat; > + > +import java.io.InputStream; > +import java.util.Properties; > + > +public class Apr { > + private static String aprInfo = null; > + > + static { > + > + try { > + InputStream is = Apr.class.getResourceAsStream > + ("/org/apache/tomcat/apr.properties"); > + Properties props = new Properties(); > + props.load(is); > + is.close(); > + aprInfo = props.getProperty("tcn.info"); > + } > + catch (Throwable t) { > + ; // Nothing > + } > + } > +} > > Propchange: tomcat/native/trunk/java/org/apache/tomcat/Apr.java > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: tomcat/native/trunk/java/org/apache/tomcat/Apr.java > ------------------------------------------------------------------------------ > svn:keywords = Author Date Id Revision > > Added: tomcat/native/trunk/java/org/apache/tomcat/apr.properties > URL: > http://svn.apache.org/viewvc/tomcat/native/trunk/java/org/apache/tomcat/apr.properties?rev=1681300&view=auto > ============================================================================== > --- tomcat/native/trunk/java/org/apache/tomcat/apr.properties (added) > +++ tomcat/native/trunk/java/org/apache/tomcat/apr.properties Sat May 23 > 09:44:41 2015 > @@ -0,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. > + > +tcn.info=Tomcat Native/@VERSION@ > > Propchange: tomcat/native/trunk/java/org/apache/tomcat/apr.properties > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: tomcat/native/trunk/java/org/apache/tomcat/apr.properties > ------------------------------------------------------------------------------ > svn:keywords = Author Date Id Revision > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org