diff options
| -rw-r--r-- | BuildAll/nbproject/build-impl.xml | 14 | ||||
| -rw-r--r-- | BuildAll/nbproject/genfiles.properties | 6 | ||||
| -rw-r--r-- | BuildAll/nbproject/project.properties | 3 | ||||
| -rw-r--r-- | BuildAll/nbproject/project.xml | 8 | ||||
| -rw-r--r-- | EssentialsProtect/nbproject/private/private.xml | 6 | ||||
| -rw-r--r-- | EssentialsProtect/nbproject/project.properties | 4 |
6 files changed, 12 insertions, 29 deletions
diff --git a/BuildAll/nbproject/build-impl.xml b/BuildAll/nbproject/build-impl.xml index dd0e3d5e1..09a0e0d9d 100644 --- a/BuildAll/nbproject/build-impl.xml +++ b/BuildAll/nbproject/build-impl.xml @@ -630,13 +630,6 @@ is divided into following sections: </antcall>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-jar.properties}"/>
- <param location="${project.EssentialsServerlist}" name="call.subproject"/>
- <param location="${project.EssentialsServerlist}/build.xml" name="call.script"/>
- <param name="call.target" value="jar"/>
- <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
- </antcall>
- <antcall target="-maybe-call-dep">
- <param name="call.built.properties" value="${built-jar.properties}"/>
<param location="${project.EssentialsSpawn}" name="call.subproject"/>
<param location="${project.EssentialsSpawn}/build.xml" name="call.script"/>
<param name="call.target" value="jar"/>
@@ -1115,13 +1108,6 @@ is divided into following sections: </antcall>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-clean.properties}"/>
- <param location="${project.EssentialsServerlist}" name="call.subproject"/>
- <param location="${project.EssentialsServerlist}/build.xml" name="call.script"/>
- <param name="call.target" value="clean"/>
- <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
- </antcall>
- <antcall target="-maybe-call-dep">
- <param name="call.built.properties" value="${built-clean.properties}"/>
<param location="${project.EssentialsSpawn}" name="call.subproject"/>
<param location="${project.EssentialsSpawn}/build.xml" name="call.script"/>
<param name="call.target" value="clean"/>
diff --git a/BuildAll/nbproject/genfiles.properties b/BuildAll/nbproject/genfiles.properties index 7775180ad..55c9a217a 100644 --- a/BuildAll/nbproject/genfiles.properties +++ b/BuildAll/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=36e85771
+build.xml.data.CRC32=60061751
build.xml.script.CRC32=7a797370
build.xml.stylesheet.CRC32=28e38971@1.42.1.45
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=36e85771
-nbproject/build-impl.xml.script.CRC32=eaedfa13
+nbproject/build-impl.xml.data.CRC32=60061751
+nbproject/build-impl.xml.script.CRC32=5fce336c
nbproject/build-impl.xml.stylesheet.CRC32=19debb58@1.42.1.45
diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties index e598ad76c..6b8e235e1 100644 --- a/BuildAll/nbproject/project.properties +++ b/BuildAll/nbproject/project.properties @@ -34,7 +34,6 @@ javac.classpath=\ ${reference.EssentialsGroupBridge.jar}:\
${reference.EssentialsGroupManager.jar}:\
${reference.EssentialsProtect.jar}:\
- ${reference.EssentialsServerlist.jar}:\
${reference.EssentialsSpawn.jar}
# Space-separated list of extra javac options
javac.compilerargs=
@@ -69,14 +68,12 @@ project.EssentialsChat=../EssentialsChat project.EssentialsGroupBridge=../EssentialsGroupBridge
project.EssentialsGroupManager=../EssentialsGroupManager
project.EssentialsProtect=../EssentialsProtect
-project.EssentialsServerlist=../EssentialsServerlist
project.EssentialsSpawn=../EssentialsSpawn
reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar
reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar
reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/original-EssentialsProtect.jar
-reference.EssentialsServerlist.jar=${project.EssentialsServerlist}/dist/EssentialsServerlist.jar
reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar
run.classpath=\
${javac.classpath}:\
diff --git a/BuildAll/nbproject/project.xml b/BuildAll/nbproject/project.xml index 8f87bed74..86e1cc4a7 100644 --- a/BuildAll/nbproject/project.xml +++ b/BuildAll/nbproject/project.xml @@ -56,14 +56,6 @@ <id>jar</id>
</reference>
<reference>
- <foreign-project>EssentialsServerlist</foreign-project>
- <artifact-type>jar</artifact-type>
- <script>build.xml</script>
- <target>jar</target>
- <clean-target>clean</clean-target>
- <id>jar</id>
- </reference>
- <reference>
<foreign-project>EssentialsSpawn</foreign-project>
<artifact-type>jar</artifact-type>
<script>build.xml</script>
diff --git a/EssentialsProtect/nbproject/private/private.xml b/EssentialsProtect/nbproject/private/private.xml new file mode 100644 index 000000000..7e3027add --- /dev/null +++ b/EssentialsProtect/nbproject/private/private.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+ <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
+ <file>file:/C:/Users/Paul/Documents/NetBeansProjects/essentials~svn/trunk/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java</file>
+ </open-files>
+</project-private>
diff --git a/EssentialsProtect/nbproject/project.properties b/EssentialsProtect/nbproject/project.properties index dcce6d152..407517c86 100644 --- a/EssentialsProtect/nbproject/project.properties +++ b/EssentialsProtect/nbproject/project.properties @@ -26,6 +26,7 @@ dist.jar=${dist.dir}/original-EssentialsProtect.jar dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
+file.reference.c3p0-0.9.1.2.jar=..\\..\\branches\\3.0\\lib\\c3p0-0.9.1.2.jar
file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
file.reference.mysql.jar=..\\lib\\mysql.jar
file.reference.sqlite.jar=..\\lib\\sqlite.jar
@@ -37,7 +38,8 @@ javac.classpath=\ ${reference.Essentials.jar}:\
${file.reference.mysql.jar}:\
${file.reference.sqlite.jar}:\
- ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}
+ ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
+ ${file.reference.c3p0-0.9.1.2.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
|