[P2play-commit] SF.net SVN: p2play: [35] trunk/P2PlayBoot
Status: Pre-Alpha
Brought to you by:
tisoft
Menu
▾
▴
[P2play-commit] SF.net SVN: p2play: [35] trunk/P2PlayBoot
|
From: <ti...@us...> - 2007-03-13 11:37:31
|
Revision: 35
http://p2play.svn.sourceforge.net/p2play/?rev=35&view=rev
Author: tisoft
Date: 2007-03-13 03:29:07 -0700 (Tue, 13 Mar 2007)
Log Message:
-----------
changed to use maven2 to build the project
Modified Paths:
--------------
trunk/P2PlayBoot/.classpath
trunk/P2PlayBoot/.project
trunk/P2PlayBoot/.settings/org.eclipse.jdt.ui.prefs
trunk/P2PlayBoot/.settings/org.eclipse.wst.common.component
trunk/P2PlayBoot/src/main/java/org/p2play/boot/pastry/Pastry.java
Added Paths:
-----------
trunk/P2PlayBoot/pom.xml
trunk/P2PlayBoot/src/main/
trunk/P2PlayBoot/src/main/java/
trunk/P2PlayBoot/src/main/java/org/
trunk/P2PlayBoot/src/main/resources/
trunk/P2PlayBoot/src/main/resources/META-INF/
trunk/P2PlayBoot/src/main/resources/user.params
Removed Paths:
-------------
trunk/P2PlayBoot/.settings/org.eclipse.jdt.core.prefs
trunk/P2PlayBoot/lib/
trunk/P2PlayBoot/src/META-INF/
trunk/P2PlayBoot/src/org/
Modified: trunk/P2PlayBoot/.classpath
===================================================================
--- trunk/P2PlayBoot/.classpath 2007-01-22 14:32:24 UTC (rev 34)
+++ trunk/P2PlayBoot/.classpath 2007-03-13 10:29:07 UTC (rev 35)
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="src/main/resources" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-vfs-20070107.jar" sourcepath="lib/sources/commons-vfs-20070107-src.zip"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.jar" sourcepath="lib/sources/commons-logging-1.1-src.zip"/>
- <classpathentry exported="true" kind="lib" path="lib/xstream-1.1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.3.4d_b2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/FreePastry.jar" sourcepath="lib/sources/FreePastry-source.zip"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/P2PlayBoot/.project
===================================================================
--- trunk/P2PlayBoot/.project 2007-01-22 14:32:24 UTC (rev 34)
+++ trunk/P2PlayBoot/.project 2007-03-13 10:29:07 UTC (rev 35)
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
Deleted: trunk/P2PlayBoot/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/P2PlayBoot/.settings/org.eclipse.jdt.core.prefs 2007-01-22 14:32:24 UTC (rev 34)
+++ trunk/P2PlayBoot/.settings/org.eclipse.jdt.core.prefs 2007-03-13 10:29:07 UTC (rev 35)
@@ -1,7 +0,0 @@
-#Tue Jan 16 23:20:09 CET 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
Modified: trunk/P2PlayBoot/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/P2PlayBoot/.settings/org.eclipse.jdt.ui.prefs 2007-01-22 14:32:24 UTC (rev 34)
+++ trunk/P2PlayBoot/.settings/org.eclipse.jdt.ui.prefs 2007-03-13 10:29:07 UTC (rev 35)
@@ -1,3 +1,4 @@
-#Tue Jan 16 21:03:57 CET 2007
+#Tue Mar 13 10:36:01 CET 2007
eclipse.preferences.version=1
+internal.default.compliance=user
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright ${year} P2Play.org\n * All rights reserved.\n *\n * This library is free software; you can redistribute it and/or\n * modify it under the terms of the GNU Lesser General Public\n * License as published by the Free Software Foundation; either\n * version 2.1 of the License, or (at your option) any later version.\n * \n * This library is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n * \n * You should have received a copy of the GNU Lesser General Public\n * License along with this library; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
Modified: trunk/P2PlayBoot/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/P2PlayBoot/.settings/org.eclipse.wst.common.component 2007-01-22 14:32:24 UTC (rev 34)
+++ trunk/P2PlayBoot/.settings/org.eclipse.wst.common.component 2007-03-13 10:29:07 UTC (rev 35)
@@ -2,5 +2,7 @@
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="P2PlayBoot">
<wb-resource deploy-path="/" source-path="/src"/>
+<wb-resource deploy-path="/" source-path="/src/main/java"/>
+<wb-resource deploy-path="/" source-path="/src/main/resources"/>
</wb-module>
</project-modules>
Added: trunk/P2PlayBoot/pom.xml
===================================================================
--- trunk/P2PlayBoot/pom.xml (rev 0)
+++ trunk/P2PlayBoot/pom.xml 2007-03-13 10:29:07 UTC (rev 35)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>P2Play</groupId>
+ <artifactId>P2PlayBoot</artifactId>
+ <version>0.0.1</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>commons-vfs</groupId>
+ <artifactId>commons-vfs</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>FreePastry</groupId>
+ <artifactId>FreePastry</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
+
Copied: trunk/P2PlayBoot/src/main/java/org (from rev 34, trunk/P2PlayBoot/src/org)
Modified: trunk/P2PlayBoot/src/main/java/org/p2play/boot/pastry/Pastry.java
===================================================================
--- trunk/P2PlayBoot/src/org/p2play/boot/pastry/Pastry.java 2007-01-22 14:32:24 UTC (rev 34)
+++ trunk/P2PlayBoot/src/main/java/org/p2play/boot/pastry/Pastry.java 2007-03-13 10:29:07 UTC (rev 35)
@@ -109,7 +109,7 @@
Environment environment = new Environment(null, null, null,
NTPTimeSource.getTimeSource(), logManager, new SimpleParameters(
- new String[]{"mmog"}, null), null);
+ new String[]{"freepastry","user"}, null), null);
NodeIdFactory nidFactory = new RandomNodeIdFactory(environment);
SocketPastryNodeFactory factory = new SocketPastryNodeFactory(
nidFactory, externalAddress, localPort, environment, null);
Copied: trunk/P2PlayBoot/src/main/resources/META-INF (from rev 34, trunk/P2PlayBoot/src/META-INF)
Added: trunk/P2PlayBoot/src/main/resources/user.params
===================================================================
--- trunk/P2PlayBoot/src/main/resources/user.params (rev 0)
+++ trunk/P2PlayBoot/src/main/resources/user.params 2007-03-13 10:29:07 UTC (rev 35)
@@ -0,0 +1,43 @@
+#default log level
+loglevel = INFO
+
+
+
+# NAT/UPnP settings
+find_firewall_policy = never
+
+nat_network_prefixes = 127.0.0.1;10.;192.168.
+# Enable and set this if you have already set up port forwarding and know the external address
+#external_address = 123.45.67.89:1234
+#enable this if you set up port forwarding (on the same port), but you don't
+#know the external address and you don't have UPnP enabled
+#this is useful for a firwall w/o UPnP support, and your IP address isn't static
+probe_for_external_address = false
+# values how to probe
+pastry_proxy_connectivity_timeout = 15000
+pastry_proxy_connectivity_tries = 3
+# possible values: always, never, prefix (prefix is if the localAddress matches any of the nat_network_prefixes
+# whether to search for a nat using UPnP
+nat_search_policy = never
+# whether to verify connectivity
+firewall_test_policy = always
+# policy for setting port forwarding the state of the firewall if there is already a conflicting rule: overwrite, fail (throw exception), change (use different port)
+# you may want to set this to overwrite or fail on the bootstrap nodes, but most freepastry applications can run on any available port, so the default is change
+nat_state_policy = change
+# the name of the application in the firewall, set this if you want your application to have a more specific name
+nat_app_name = freepastry
+# how long to wait for responses from the firewall, in millis
+nat_discovery_timeout = 5000
+# how many searches to try to find a free firewall port
+nat_find_port_max_tries = 10
+# uncomment this to use UPnP NAT port forwarding, you need to include in the classpath: commons-jxpath-1.1.jar:commons-logging.jar:sbbi-upnplib-xxx.jar
+nat_handler_class = rice.pastry.socket.nat.sbbi.SBBINatHandler
+# hairpinning:
+# default "prefix" requires more bandwidth if you are behind a NAT. It enables multiple IP
+# addresses in the NodeHandle if you are behind a NAT. These are usually the internet routable address,
+# and the LAN address (usually 192.168.x.x)
+# you can set this to never if any of the following conditions hold:
+# a) you are the only FreePastry node behind this address
+# b) you firewall supports hairpinning see
+# http://scm.sipfoundry.org/rep/ietf-drafts/behave/draft-ietf-behave-nat-udp-03.html#rfc.section.6
+nat_nodehandle_multiaddress = prefix
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
