Commit d9de2d2a authored by Jason Sanchez's avatar Jason Sanchez
Browse files

Added rules to create bundle, fixed javadoc issue

parent c101de7e

pom.xml

+69 −0
Original line number Diff line number Diff line
@@ -43,4 +43,73 @@ 
    <properties>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

    </properties>

    

    <build>

        <plugins>

            <plugin>

                <groupId>org.apache.maven.plugins</groupId>

                <artifactId>maven-source-plugin</artifactId>

                <version>2.2.1</version>

                <executions>

                    <execution>

                        <id>attach-sources</id>

                        <phase>verify</phase>

                        <goals>

                            <goal>jar-no-fork</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

            <plugin>

                <groupId>org.apache.maven.plugins</groupId>

                <artifactId>maven-javadoc-plugin</artifactId>

                <version>2.9</version>

                <executions>

                    <execution>

                        <phase>verify</phase>

                        <goals>

                            <goal>javadoc</goal>

                            <goal>jar</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

            <plugin>

                <groupId>org.apache.maven.plugins</groupId>

                <artifactId>maven-gpg-plugin</artifactId>

                <version>1.1</version>

                <configuration>

                    <executable>gpg2.exe</executable>

                    <useAgent>true</useAgent>

                </configuration>

                <executions>

                    <execution>

                        <id>sign-artifacts</id>

                        <phase>verify</phase>

                        <goals>

                            <goal>sign</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

            <plugin>

                <artifactId>maven-assembly-plugin</artifactId>

                <version>2.4</version>

                <configuration>

                    <finalName>rs.jar</finalName>

                    <descriptors>

                        <descriptor>src/main/assembly/bundle.xml</descriptor>

                    </descriptors>

                </configuration>

                <executions>

                    <execution>

                        <phase>verify</phase>

                        <goals>

                            <goal>single</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

        </plugins>

    </build>

</project>

src/main/assembly/bundle.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">

    <id>bundle</id>

    <formats>

        <format>jar</format>

    </formats>

    <baseDirectory>/</baseDirectory>

    <fileSets>

        <fileSet>

            <directory>${project.build.directory}</directory>

            <outputDirectory>/</outputDirectory>

            <includes>

                <include>${project.build.finalName}.jar</include>

                <include>${project.build.finalName}.jar.asc</include>

                <include>${project.build.finalName}.pom</include>

                <include>${project.build.finalName}.pom.asc</include>

                <include>${project.build.finalName}-javadoc.jar</include>

                <include>${project.build.finalName}-javadoc.jar.asc</include>

                <include>${project.build.finalName}-sources.jar</include>

                <include>${project.build.finalName}-sources.jar.asc</include>

            </includes>

        </fileSet>

    </fileSets>

</assembly>
 
 No newline at end of file

src/main/java/com/jmatio/types/MLSparse.java

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ public class MLSparse extends MLNumericArray<Double> 
     * Gets column indices. 

     * 

     * <tt>jc</tt> points to an integer array of length N+1 that contains column index information.

     * For j, in the range <tt>0&lt;=j&lt;=N1</tt>, <tt>jc[j]</tt> is the index in ir and <tt>pr</tt> (and <tt>pi</tt>

     * if it exists) of the first nonzero entry in the jth column and <tt>jc[j+1]1</tt> index

     * For j, in the range <tt>0&lt;=j&lt;=N</tt>, <tt>jc[j]</tt> is the index in ir and <tt>pr</tt> (and <tt>pi</tt>

     * if it exists) of the first nonzero entry in the jth column and <tt>jc[j+1]�1</tt> index

     * of the last nonzero entry. As a result, <tt>jc[N]</tt> is also equal to nnz, the number

     * of nonzero entries in the matrix. If nnz is less than nzmax, then more nonzero

     * entries can be inserted in the array without allocating additional storage