Menu
▾
▴
[Openfast-commit] SF.net SVN: openfast:[291] branches/generics-cleanup
|
From: <ope...@li...> - 2012-04-12 17:20:45
|
Revision: 291
http://openfast.svn.sourceforge.net/openfast/?rev=291&view=rev
Author: joshseidel
Date: 2012-04-12 17:20:38 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Update to trunk.
Modified Paths:
--------------
branches/generics-cleanup/README
branches/generics-cleanup/pom.xml
branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java
branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastEndpoint.java
branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastInputStream.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/BitVectorType.java
Property Changed:
----------------
branches/generics-cleanup/
branches/generics-cleanup/pom.xml
Property changes on: branches/generics-cleanup
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:267-274
+ /trunk:267-290
Modified: branches/generics-cleanup/README
===================================================================
--- branches/generics-cleanup/README 2012-04-11 19:51:39 UTC (rev 290)
+++ branches/generics-cleanup/README 2012-04-12 17:20:38 UTC (rev 291)
@@ -1,8 +1,29 @@
-OpenFAST uses the Maven2 build tool. Downloaded the latest version of Maven2 from http://maven.apache.org.
+Building
+========
+ OpenFAST uses the Maven2 build tool. Downloaded the latest version of Maven2 from http://maven.apache.org.
-To build OpenFAST using maven, enter from a command line:
+ To build OpenFAST using maven, enter from a command line:
> mvn package
-
-To generate Eclipse .project and .classpath files so that OpenFAST can be imported into Eclipse:
+
+Eclipse
+=======
+ To generate Eclipse .project and .classpath files so that OpenFAST can be imported into Eclipse:
> mvn eclipse:eclipse
-
\ No newline at end of file
+
+Deploying
+=========
+ To deploy to the OpenFAST maven repository complete the following steps:
+ 1. Contact project administrators to get shell access to the OpenFAST
+ 2. Add the following configuration to the M2 settings.xml file where [USERNAME] is an authorized user from step 1.
+ <server>
+ <id>sourceforge.net</id>
+ <username>[USERNAME],openfast</username>
+ <filePermissions>664</filePermissions>
+ <directoryPermissions>775</directoryPermissions>
+ <password>[PASSWORD]</password>
+ </server>
+
+ SourceForge has new restricted shell access. To release or deploy OpenFAST, use the following steps:
+ For more information see http://maven.apache.org/plugins/maven-site-plugin-3.0-beta-3/examples/site-deploy-to-sourceforge.net.html
+ 1. ssh -t jac...@sh... create
+ 2. mvn deploy
\ No newline at end of file
Modified: branches/generics-cleanup/pom.xml
===================================================================
--- branches/generics-cleanup/pom.xml 2012-04-11 19:51:39 UTC (rev 290)
+++ branches/generics-cleanup/pom.xml 2012-04-12 17:20:38 UTC (rev 291)
@@ -3,7 +3,7 @@
<groupId>org.openfast</groupId>
<artifactId>openfast</artifactId>
<packaging>jar</packaging>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<organization>
<name>The LaSalle Technology Group, LLC</name>
@@ -150,7 +150,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>1.0-beta-2</version>
+ <version>2.2</version>
</extension>
</extensions>
@@ -241,21 +241,21 @@
<id>sourceforge.net</id>
<name>Sourceforge.net Repository</name>
<url>
- scp://web.sourceforge.net/home/project-web/openfast/htdocs/maven/release
+ scp://shell.sourceforge.net/home/project-web/openfast/htdocs/maven/release
</url>
</repository>
<snapshotRepository>
<id>sourceforge.net</id>
<name>Sourceforge.net Snapshot Repository</name>
<url>
- scp://web.sourceforge.net/home/project-web/openfast/htdocs/maven/snapshot
+ scp://shell.sourceforge.net/home/project-web/openfast/htdocs/maven/snapshot
</url>
</snapshotRepository>
<site>
<id>sourceforge.net</id>
<name>Sourceforge.net OpenFAST Web Site</name>
<url>
- scp://web.sourceforge.net/home/project-web/openfast/htdocs
+ scp://shell.sourceforge.net/home/project-web/openfast/htdocs
</url>
</site>
</distributionManagement>
Property changes on: branches/generics-cleanup/pom.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java 2012-04-11 19:51:39 UTC (rev 290)
+++ branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java 2012-04-12 17:20:38 UTC (rev 291)
@@ -22,12 +22,12 @@
import java.io.IOException;
import java.io.InputStream;
+
import org.openfast.BitVector;
import org.openfast.BitVectorReader;
import org.openfast.BitVectorValue;
import org.openfast.Context;
import org.openfast.Message;
-import org.openfast.error.FastConstants;
import org.openfast.error.FastException;
import org.openfast.template.MessageTemplate;
import org.openfast.template.type.codec.TypeCodec;
Modified: branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastEndpoint.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastEndpoint.java 2012-04-11 19:51:39 UTC (rev 290)
+++ branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastEndpoint.java 2012-04-12 17:20:38 UTC (rev 291)
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.MulticastSocket;
import java.net.SocketException;
@@ -47,7 +48,7 @@
protected MulticastSocket createSocket() throws FastConnectionException {
try {
- MulticastSocket socket = new MulticastSocket(port);
+ MulticastSocket socket = new MulticastSocket(new InetSocketAddress(group, port));
if (ifaddr != null) {
try {
socket.setInterface(InetAddress.getByName(ifaddr));
Modified: branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastInputStream.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastInputStream.java 2012-04-11 19:51:39 UTC (rev 290)
+++ branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastInputStream.java 2012-04-12 17:20:38 UTC (rev 291)
@@ -53,4 +53,9 @@
}
return (buffer.get() & 0xFF);
}
+
+ @Override
+ public int available() throws IOException {
+ return buffer.remaining();
+ }
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/BitVectorType.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/BitVectorType.java 2012-04-11 19:51:39 UTC (rev 290)
+++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/BitVectorType.java 2012-04-12 17:20:38 UTC (rev 291)
@@ -23,17 +23,16 @@
*/
package org.openfast.template.type.codec;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.openfast.BitVector;
import org.openfast.BitVectorValue;
import org.openfast.Global;
import org.openfast.ScalarValue;
import org.openfast.error.FastConstants;
-import org.openfast.error.FastException;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
public final class BitVectorType extends TypeCodec {
private static final long serialVersionUID = 1L;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
