1.1 --- a/.hgignore Mon Oct 06 09:36:27 2008 +0200
1.2 +++ b/.hgignore Sun Nov 23 23:10:04 2008 +0100
1.3 @@ -1,2 +1,4 @@
1.4 java/SuperDAO/dist/*
1.5 java/SuperDAO/build/*
1.6 +java/SuperDAOplugin/build/*
1.7 +
2.1 --- a/java/SuperDAO/nbproject/build-impl.xml Mon Oct 06 09:36:27 2008 +0200
2.2 +++ b/java/SuperDAO/nbproject/build-impl.xml Sun Nov 23 23:10:04 2008 +0100
2.3 @@ -218,13 +218,13 @@
2.4 </sequential>
2.5 </macrodef>
2.6 </target>
2.7 - <target name="-init-macrodef-nbjpda">
2.8 + <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
2.9 <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
2.10 <attribute default="${main.class}" name="name"/>
2.11 <attribute default="${debug.classpath}" name="classpath"/>
2.12 <attribute default="" name="stopclassname"/>
2.13 <sequential>
2.14 - <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
2.15 + <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
2.16 <classpath>
2.17 <path path="@{classpath}"/>
2.18 </classpath>
2.19 @@ -255,6 +255,12 @@
2.20 <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
2.21 <istrue value="${have-jdk-older-than-1.4}"/>
2.22 </condition>
2.23 + <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
2.24 + <os family="windows"/>
2.25 + </condition>
2.26 + <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
2.27 + <isset property="debug.transport"/>
2.28 + </condition>
2.29 </target>
2.30 <target depends="-init-debug-args" name="-init-macrodef-debug">
2.31 <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
2.32 @@ -264,7 +270,7 @@
2.33 <sequential>
2.34 <java classname="@{classname}" dir="${work.dir}" fork="true">
2.35 <jvmarg line="${debug-args-line}"/>
2.36 - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
2.37 + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
2.38 <jvmarg line="${run.jvmargs}"/>
2.39 <classpath>
2.40 <path path="@{classpath}"/>
2.41 @@ -311,6 +317,13 @@
2.42 ===================
2.43 -->
2.44 <target depends="init" name="deps-jar" unless="no.deps"/>
2.45 + <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
2.46 + <target depends="init" name="-check-automatic-build">
2.47 + <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
2.48 + </target>
2.49 + <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
2.50 + <antcall target="clean"/>
2.51 + </target>
2.52 <target depends="init,deps-jar" name="-pre-pre-compile">
2.53 <mkdir dir="${build.classes.dir}"/>
2.54 </target>
2.55 @@ -331,7 +344,7 @@
2.56 <!-- Empty placeholder for easier customization. -->
2.57 <!-- You can override this target in the ../build.xml file. -->
2.58 </target>
2.59 - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
2.60 + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
2.61 <target name="-pre-compile-single">
2.62 <!-- Empty placeholder for easier customization. -->
2.63 <!-- You can override this target in the ../build.xml file. -->
2.64 @@ -345,7 +358,7 @@
2.65 <!-- Empty placeholder for easier customization. -->
2.66 <!-- You can override this target in the ../build.xml file. -->
2.67 </target>
2.68 - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
2.69 + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
2.70 <!--
2.71 ====================
2.72 JAR BUILDING SECTION
3.1 --- a/java/SuperDAO/nbproject/genfiles.properties Mon Oct 06 09:36:27 2008 +0200
3.2 +++ b/java/SuperDAO/nbproject/genfiles.properties Sun Nov 23 23:10:04 2008 +0100
3.3 @@ -1,8 +1,8 @@
3.4 build.xml.data.CRC32=958f21fd
3.5 -build.xml.script.CRC32=875a74e8
3.6 -build.xml.stylesheet.CRC32=be360661
3.7 +build.xml.script.CRC32=99ab1884
3.8 +build.xml.stylesheet.CRC32=958a1d3e
3.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
3.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
3.11 nbproject/build-impl.xml.data.CRC32=958f21fd
3.12 -nbproject/build-impl.xml.script.CRC32=196dbf97
3.13 -nbproject/build-impl.xml.stylesheet.CRC32=487672f9
3.14 +nbproject/build-impl.xml.script.CRC32=d53793de
3.15 +nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5
4.1 --- a/java/SuperDAO/nbproject/private/private.properties Mon Oct 06 09:36:27 2008 +0200
4.2 +++ b/java/SuperDAO/nbproject/private/private.properties Sun Nov 23 23:10:04 2008 +0100
4.3 @@ -1,2 +1,7 @@
4.4 -jaxws.endorsed.dir=/usr/local/netbeans-6.1/java2/modules/ext/jaxws21/api
4.5 -user.properties.file=/home/fiki/.netbeans/6.1/build.properties
4.6 +compile.on.save=true
4.7 +do.depend=false
4.8 +do.jar=true
4.9 +javac.debug=true
4.10 +javadoc.preview=true
4.11 +jaxws.endorsed.dir=/usr/local/netbeans-6.5/java2/modules/ext/jaxws21/api:/usr/local/netbeans-6.5/ide10/modules/ext/jaxb/api
4.12 +user.properties.file=/home/fiki/src/p\u00edskovi\u0161t\u011b/Graf1/build/testuserdir/build.properties
5.1 --- a/java/SuperDAO/nbproject/project.properties Mon Oct 06 09:36:27 2008 +0200
5.2 +++ b/java/SuperDAO/nbproject/project.properties Sun Nov 23 23:10:04 2008 +0100
5.3 @@ -1,3 +1,5 @@
5.4 +application.title=SuperDAO
5.5 +application.vendor=fiki
5.6 build.classes.dir=${build.dir}/classes
5.7 build.classes.excludes=**/*.java,**/*.form
5.8 # This directory is removed when the project is cleaned:
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/java/SuperDAOplugin/manifest.mf Sun Nov 23 23:10:04 2008 +0100
6.3 @@ -0,0 +1,6 @@
6.4 +Manifest-Version: 1.0
6.5 +OpenIDE-Module: cz.frantovo.superDAO
6.6 +OpenIDE-Module-Layer: cz/frantovo/superDAO/layer.xml
6.7 +OpenIDE-Module-Localizing-Bundle: cz/frantovo/superDAO/Bundle.properties
6.8 +OpenIDE-Module-Specification-Version: 1.0
6.9 +
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/java/SuperDAOplugin/nbproject/build-impl.xml Sun Nov 23 23:10:04 2008 +0100
7.3 @@ -0,0 +1,27 @@
7.4 +<?xml version="1.0" encoding="UTF-8"?>
7.5 +<!--
7.6 +*** GENERATED FROM project.xml - DO NOT EDIT ***
7.7 +*** EDIT ../build.xml INSTEAD ***
7.8 +-->
7.9 +<project name="cz.frantovo.superDAO-impl" basedir="..">
7.10 + <property file="nbproject/private/platform-private.properties"/>
7.11 + <property file="nbproject/platform.properties"/>
7.12 + <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
7.13 + <attribute name="name"/>
7.14 + <attribute name="value"/>
7.15 + <sequential>
7.16 + <property name="@{name}" value="${@{value}}"/>
7.17 + </sequential>
7.18 + </macrodef>
7.19 + <property file="${user.properties.file}"/>
7.20 + <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
7.21 + <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
7.22 + <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'">
7.23 + <condition>
7.24 + <not>
7.25 + <available file="${harness.dir}" type="dir"/>
7.26 + </not>
7.27 + </condition>
7.28 + </fail>
7.29 + <import file="${harness.dir}/build.xml"/>
7.30 +</project>
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/java/SuperDAOplugin/nbproject/genfiles.properties Sun Nov 23 23:10:04 2008 +0100
8.3 @@ -0,0 +1,8 @@
8.4 +build.xml.data.CRC32=2d88a397
8.5 +build.xml.script.CRC32=ca10ceb8
8.6 +build.xml.stylesheet.CRC32=79c3b980
8.7 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
8.8 +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
8.9 +nbproject/build-impl.xml.data.CRC32=2d88a397
8.10 +nbproject/build-impl.xml.script.CRC32=e97ccad3
8.11 +nbproject/build-impl.xml.stylesheet.CRC32=deb65f65
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/java/SuperDAOplugin/nbproject/platform.properties Sun Nov 23 23:10:04 2008 +0100
9.3 @@ -0,0 +1,1 @@
9.4 +nbplatform.active=default
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
10.2 +++ b/java/SuperDAOplugin/nbproject/private/platform-private.properties Sun Nov 23 23:10:04 2008 +0100
10.3 @@ -0,0 +1,1 @@
10.4 +user.properties.file=/home/fiki/.netbeans/6.5/build.properties
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
11.2 +++ b/java/SuperDAOplugin/nbproject/project.properties Sun Nov 23 23:10:04 2008 +0100
11.3 @@ -0,0 +1,5 @@
11.4 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=8
11.5 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80
11.6 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=default
11.7 +javac.source=1.5
11.8 +javac.compilerargs=-Xlint -Xlint:-serial
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
12.2 +++ b/java/SuperDAOplugin/nbproject/project.xml Sun Nov 23 23:10:04 2008 +0100
12.3 @@ -0,0 +1,14 @@
12.4 +<?xml version="1.0" encoding="UTF-8"?>
12.5 +<project xmlns="http://www.netbeans.org/ns/project/1">
12.6 + <type>org.netbeans.modules.apisupport.project</type>
12.7 + <configuration>
12.8 + <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
12.9 + <code-name-base>cz.frantovo.superDAO</code-name-base>
12.10 + <standalone/>
12.11 + <module-dependencies/>
12.12 + <public-packages>
12.13 + <package>cz.frantovo.superDAO</package>
12.14 + </public-packages>
12.15 + </data>
12.16 + </configuration>
12.17 +</project>
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
13.2 +++ b/java/SuperDAOplugin/src/cz/frantovo/superDAO/Bundle.properties Sun Nov 23 23:10:04 2008 +0100
13.3 @@ -0,0 +1,5 @@
13.4 +OpenIDE-Module-Display-Category=Database
13.5 +OpenIDE-Module-Long-Description=\
13.6 + Obsahuje metody pro na\u010d\u00edt\u00e1n\u00ed SQL p\u0159\u00edkaz\u016f z XML soubor\u016f
13.7 +OpenIDE-Module-Name=SuperDAOplugin
13.8 +OpenIDE-Module-Short-Description=P\u0159edek pro DAO t\u0159\u00eddy
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14.2 +++ b/java/SuperDAOplugin/src/cz/frantovo/superDAO/SuperDAO.java Sun Nov 23 23:10:04 2008 +0100
14.3 @@ -0,0 +1,1 @@
14.4 +../../../../../SuperDAO/src/cz/frantovo/superDAO/SuperDAO.java
14.5 \ No newline at end of file
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
15.2 +++ b/java/SuperDAOplugin/src/cz/frantovo/superDAO/SuperDAO.sql.xml Sun Nov 23 23:10:04 2008 +0100
15.3 @@ -0,0 +1,1 @@
15.4 +../../../../../SuperDAO/src/cz/frantovo/superDAO/SuperDAO.sql.xml
15.5 \ No newline at end of file
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
16.2 +++ b/java/SuperDAOplugin/src/cz/frantovo/superDAO/layer.xml Sun Nov 23 23:10:04 2008 +0100
16.3 @@ -0,0 +1,4 @@
16.4 +<?xml version="1.0" encoding="UTF-8"?>
16.5 +<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
16.6 +<filesystem>
16.7 +</filesystem>