1.1 --- a/nbproject/build-impl.xml	Sun Nov 01 05:41:39 2009 +0300
     1.2 +++ b/nbproject/build-impl.xml	Mon Nov 02 18:36:24 2009 +0300
     1.3 @@ -20,13 +20,6 @@
     1.4  
     1.5          -->
     1.6  <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="tomcat-userconfig-impl">
     1.7 -    <fail message="Please build using Ant 1.7.1 or higher.">
     1.8 -        <condition>
     1.9 -            <not>
    1.10 -                <antversion atleast="1.7.1"/>
    1.11 -            </not>
    1.12 -        </condition>
    1.13 -    </fail>
    1.14      <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
    1.15      <!-- 
    1.16                  ======================
    1.17 @@ -159,18 +152,10 @@
    1.18              <attribute default="${includes}" name="includes"/>
    1.19              <attribute default="${excludes}" name="excludes"/>
    1.20              <attribute default="${javac.debug}" name="debug"/>
    1.21 -            <attribute default="${empty.dir}" name="sourcepath"/>
    1.22 -            <attribute default="${empty.dir}" name="gensrcdir"/>
    1.23 +            <attribute default="/does/not/exist" name="sourcepath"/>
    1.24              <element name="customize" optional="true"/>
    1.25              <sequential>
    1.26 -                <property location="${build.dir}/empty" name="empty.dir"/>
    1.27 -                <mkdir dir="${empty.dir}"/>
    1.28                  <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
    1.29 -                    <src>
    1.30 -                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
    1.31 -                            <include name="*"/>
    1.32 -                        </dirset>
    1.33 -                    </src>
    1.34                      <classpath>
    1.35                          <path path="@{classpath}"/>
    1.36                      </classpath>
    1.37 @@ -286,8 +271,6 @@
    1.38                  <java classname="@{classname}" dir="${work.dir}" fork="true">
    1.39                      <jvmarg line="${debug-args-line}"/>
    1.40                      <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
    1.41 -                    <jvmarg value="-Dfile.encoding=${source.encoding}"/>
    1.42 -                    <redirector errorencoding="${source.encoding}" inputencoding="${source.encoding}" outputencoding="${source.encoding}"/>
    1.43                      <jvmarg line="${run.jvmargs}"/>
    1.44                      <classpath>
    1.45                          <path path="@{classpath}"/>
    1.46 @@ -304,15 +287,12 @@
    1.47      <target name="-init-macrodef-java">
    1.48          <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
    1.49              <attribute default="${main.class}" name="classname"/>
    1.50 -            <attribute default="${run.classpath}" name="classpath"/>
    1.51              <element name="customize" optional="true"/>
    1.52              <sequential>
    1.53                  <java classname="@{classname}" dir="${work.dir}" fork="true">
    1.54 -                    <jvmarg value="-Dfile.encoding=${source.encoding}"/>
    1.55 -                    <redirector errorencoding="${source.encoding}" inputencoding="${source.encoding}" outputencoding="${source.encoding}"/>
    1.56                      <jvmarg line="${run.jvmargs}"/>
    1.57                      <classpath>
    1.58 -                        <path path="@{classpath}"/>
    1.59 +                        <path path="${run.classpath}"/>
    1.60                      </classpath>
    1.61                      <syspropertyset>
    1.62                          <propertyref prefix="run-sys-prop."/>
    1.63 @@ -352,15 +332,10 @@
    1.64          <!-- You can override this target in the ../build.xml file. -->
    1.65      </target>
    1.66      <target if="do.depend.true" name="-compile-depend">
    1.67 -        <pathconvert property="build.generated.subdirs">
    1.68 -            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
    1.69 -                <include name="*"/>
    1.70 -            </dirset>
    1.71 -        </pathconvert>
    1.72 -        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
    1.73 +        <j2seproject3:depend/>
    1.74      </target>
    1.75      <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
    1.76 -        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
    1.77 +        <j2seproject3:javac/>
    1.78          <copy todir="${build.classes.dir}">
    1.79              <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    1.80          </copy>
    1.81 @@ -377,7 +352,7 @@
    1.82      <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
    1.83          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
    1.84          <j2seproject3:force-recompile/>
    1.85 -        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
    1.86 +        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
    1.87      </target>
    1.88      <target name="-post-compile-single">
    1.89          <!-- Empty placeholder for easier customization. -->
    1.90 @@ -443,29 +418,11 @@
    1.91          <property location="${dist.jar}" name="dist.jar.resolved"/>
    1.92          <echo>java -jar "${dist.jar.resolved}"</echo>
    1.93      </target>
    1.94 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="libs.CopyLibs.classpath" name="-do-jar-with-libraries-without-manifest" unless="manifest.available+main.class">
    1.95 -        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
    1.96 -        <pathconvert property="run.classpath.without.build.classes.dir">
    1.97 -            <path path="${run.classpath}"/>
    1.98 -            <map from="${build.classes.dir.resolved}" to=""/>
    1.99 -        </pathconvert>
   1.100 -        <pathconvert pathsep=" " property="jar.classpath">
   1.101 -            <path path="${run.classpath.without.build.classes.dir}"/>
   1.102 -            <chainedmapper>
   1.103 -                <flattenmapper/>
   1.104 -                <globmapper from="*" to="lib/*"/>
   1.105 -            </chainedmapper>
   1.106 -        </pathconvert>
   1.107 -        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
   1.108 -        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   1.109 -            <fileset dir="${build.classes.dir}"/>
   1.110 -        </copylibs>
   1.111 -    </target>
   1.112      <target name="-post-jar">
   1.113          <!-- Empty placeholder for easier customization. -->
   1.114          <!-- You can override this target in the ../build.xml file. -->
   1.115      </target>
   1.116 -    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-manifest,-post-jar" description="Build JAR." name="jar"/>
   1.117 +    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
   1.118      <!--
   1.119                  =================
   1.120                  EXECUTION SECTION
   1.121 @@ -485,10 +442,6 @@
   1.122          <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   1.123          <j2seproject1:java classname="${run.class}"/>
   1.124      </target>
   1.125 -    <target depends="init,-do-not-recompile,compile-test-single" name="run-test-with-main">
   1.126 -        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   1.127 -        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
   1.128 -    </target>
   1.129      <!--
   1.130                  =================
   1.131                  DEBUGGING SECTION
   1.132 @@ -497,9 +450,6 @@
   1.133      <target depends="init" if="netbeans.home" name="-debug-start-debugger">
   1.134          <j2seproject1:nbjpdastart name="${debug.class}"/>
   1.135      </target>
   1.136 -    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
   1.137 -        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
   1.138 -    </target>
   1.139      <target depends="init,compile" name="-debug-start-debuggee">
   1.140          <j2seproject3:debug>
   1.141              <customize>
   1.142 @@ -517,11 +467,6 @@
   1.143          <j2seproject3:debug classname="${debug.class}"/>
   1.144      </target>
   1.145      <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
   1.146 -    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
   1.147 -        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
   1.148 -        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
   1.149 -    </target>
   1.150 -    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
   1.151      <target depends="init" name="-pre-debug-fix">
   1.152          <fail unless="fix.includes">Must set fix.includes</fail>
   1.153          <property name="javac.includes" value="${fix.includes}.java"/>
   1.154 @@ -544,9 +489,6 @@
   1.155              <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
   1.156                  <filename name="**/*.java"/>
   1.157              </fileset>
   1.158 -            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
   1.159 -                <include name="**/*.java"/>
   1.160 -            </fileset>
   1.161          </javadoc>
   1.162      </target>
   1.163      <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
   1.164 @@ -608,7 +550,7 @@
   1.165          <j2seproject3:junit testincludes="**/*Test.java"/>
   1.166      </target>
   1.167      <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
   1.168 -        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   1.169 +        <fail if="tests.failed">Some tests failed; see details above.</fail>
   1.170      </target>
   1.171      <target depends="init" if="have.tests" name="test-report"/>
   1.172      <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
   1.173 @@ -621,7 +563,7 @@
   1.174          <j2seproject3:junit excludes="" includes="${test.includes}"/>
   1.175      </target>
   1.176      <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
   1.177 -        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   1.178 +        <fail if="tests.failed">Some tests failed; see details above.</fail>
   1.179      </target>
   1.180      <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
   1.181      <!--

     2.1 --- a/nbproject/genfiles.properties	Sun Nov 01 05:41:39 2009 +0300
     2.2 +++ b/nbproject/genfiles.properties	Mon Nov 02 18:36:24 2009 +0300
     2.3 @@ -1,8 +1,8 @@
     2.4  build.xml.data.CRC32=8168bf3c
     2.5  build.xml.script.CRC32=d8558c95
     2.6 -build.xml.stylesheet.CRC32=958a1d3e@1.26.2.45
     2.7 +build.xml.stylesheet.CRC32=958a1d3e
     2.8  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     2.9  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    2.10  nbproject/build-impl.xml.data.CRC32=8168bf3c
    2.11 -nbproject/build-impl.xml.script.CRC32=92172d17
    2.12 -nbproject/build-impl.xml.stylesheet.CRC32=5c621a33@1.26.2.45
    2.13 +nbproject/build-impl.xml.script.CRC32=22b92b6d
    2.14 +nbproject/build-impl.xml.stylesheet.CRC32=65b8de21

     3.1 --- a/src/kryshen/catalina/startup/PasswdUserConfig.java	Sun Nov 01 05:41:39 2009 +0300
     3.2 +++ b/src/kryshen/catalina/startup/PasswdUserConfig.java	Mon Nov 02 18:36:24 2009 +0300
     3.3 @@ -1,8 +1,3 @@
     3.4 -/*
     3.5 - * To change this template, choose Tools | Templates
     3.6 - * and open the template in the editor.
     3.7 - */
     3.8 -
     3.9  package kryshen.catalina.startup;
    3.10  
    3.11  /**
    3.12 @@ -16,7 +11,12 @@
    3.13      /**
    3.14       * Command for retrieving passwd database.
    3.15       */
    3.16 -    private String getent = "getent";
    3.17 +    private String getent = null;
    3.18 +
    3.19 +    /**
    3.20 +     * Path to local passwd file.
    3.21 +     */
    3.22 +    private String passwd = "/etc/passwd";
    3.23  
    3.24      /**
    3.25       * Get command for retrieving passwd database.
    3.26 @@ -32,9 +32,22 @@
    3.27          this.getent = getent;
    3.28      }
    3.29  
    3.30 +    /**
    3.31 +     * Get path to local passwd file.
    3.32 +     */
    3.33 +    public String getPasswd() {
    3.34 +        return passwd;
    3.35 +    }
    3.36 +
    3.37 +    /**
    3.38 +     * Set path to local passwd file.
    3.39 +     */
    3.40 +    public void setPasswd(String passwd) {
    3.41 +        this.passwd = passwd;
    3.42 +    }
    3.43 +
    3.44      @Override
    3.45      protected void deployUserApps() {
    3.46          // TODO
    3.47      }
    3.48 -
    3.49  }