Commit ea6a28c6 authored by terrymanu's avatar terrymanu
Browse files

add package assembly

parent e74249ff

pom.xml

+6 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
        <guava-retrying.version>2.0.0</guava-retrying.version>

        

        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>

        <maven-assembly-plugin.version>2.5.5</maven-assembly-plugin.version>

        <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>

        <maven-resources-plugin.version>2.7</maven-resources-plugin.version>

        <maven-jar-plugin.version>2.6</maven-jar-plugin.version>

        <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
@@ -333,6 +333,11 @@ 
                        <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>

                    </configuration>

                </plugin>

                <plugin>

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

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

                    <version>${maven-assembly-plugin.version}</version>

                </plugin>

                <plugin>

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

                    <artifactId>maven-site-plugin</artifactId>

sharding-jdbc-server/pom.xml

+24 −1
Original line number Diff line number Diff line
@@ -70,4 +70,27 @@ 
            <artifactId>hamcrest-library</artifactId>

        </dependency>

    </dependencies>

    

    <build>

        <plugins>

            <plugin>

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

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

                <configuration>

                    <descriptors>

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

                    </descriptors>

                </configuration>

                <executions>

                    <execution>

                        <id>assembly</id>

                        <phase>package</phase>

                        <goals>

                            <goal>single</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

        </plugins>

    </build>

</project>

sharding-jdbc-server/src/main/java/io/shardingjdbc/server/DataSourceManager.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ public final class DataSourceManager { 
    

    public DataSourceManager() {

        try {

            dataSource = ShardingDataSourceFactory.createDataSource(new File(ComQueryPacket.class.getResource("/META-INF/sharding-config.yaml").getFile()));

            dataSource = ShardingDataSourceFactory.createDataSource(new File(ComQueryPacket.class.getResource("/conf/sharding-config.yaml").getFile()));

        } catch (final IOException | SQLException ex) {

            throw new ShardingJdbcException(ex);

        }

sharding-jdbc-server/src/main/resources/assembly/assembly.xml

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

          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">

    <id>assembly</id>

    <formats>

        <format>tar.gz</format>

    </formats>

    <includeBaseDirectory>true</includeBaseDirectory>

    

    <fileSets>

        <fileSet>

            <directory>src/main/resources/bin</directory>

            <outputDirectory>bin</outputDirectory>

            <fileMode>0755</fileMode>

        </fileSet>

        <fileSet>

            <directory>src/main/resources/conf</directory>

            <outputDirectory>conf</outputDirectory>

            <fileMode>0644</fileMode>

        </fileSet>

    </fileSets>

    

    <dependencySets>

        <dependencySet>

            <outputDirectory>lib</outputDirectory>

            <fileMode>0644</fileMode>

        </dependencySet>

    </dependencySets>

</assembly>

sharding-jdbc-server/src/main/resources/bin/start.sh

0 → 100755
+4 −0
Original line number Diff line number Diff line 
#!/bin/bash

cd `dirname $0`



echo good