Author: ctubbsii Date: Mon May 13 15:43:29 2013 New Revision: 1481935 URL: http://svn.apache.org/r1481935 Log: ACCUMULO-1404 include proxy bindings, proxy thrift definition for additional bindings, and example source code in binary packages
Modified: accumulo/branches/1.5/assemble/pom.xml accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml Modified: accumulo/branches/1.5/assemble/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1481935&r1=1481934&r2=1481935&view=diff ============================================================================== --- accumulo/branches/1.5/assemble/pom.xml (original) +++ accumulo/branches/1.5/assemble/pom.xml Mon May 13 15:43:29 2013 @@ -220,6 +220,37 @@ </sources> </mapping> <mapping> + <directory>/opt/accumulo/accumulo-${project.version}/proxy/thrift</directory> + <sources> + <source> + <location>${accumulo-top}/proxy/src/main/thrift</location> + <includes> + <include>*.thrift</include> + </includes> + </source> + <source> + <location>${accumulo-top}/proxy/target</location> + <includes> + <include>gen-cpp/**</include> + <include>gen-py/**</include> + <include>gen-rb/**</include> + </includes> + </source> + </sources> + </mapping> + <mapping> + <directory>/opt/accumulo/accumulo-${project.version}/examples/simple</directory> + <recurseDirectories>true</recurseDirectories> + <sources> + <source> + <location>${accumulo-top}/examples/simple</location> + <includes> + <include>src/main/**</include> + </includes> + </source> + </sources> + </mapping> + <mapping> <directory>/opt/accumulo/accumulo-${project.version}/conf</directory> <recurseDirectories>true</recurseDirectories> <sources> @@ -399,6 +430,24 @@ <excludes>**/.svn/**,src/**</excludes> </data> <data> + <src>${accumulo-top}/proxy/src/main/thrift</src> + <type>directory</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/proxy/thrift</prefix> + </mapper> + <includes>*.thrift</includes> + </data> + <data> + <src>${accumulo-top}/proxy/target</src> + <type>directory</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/proxy/thrift</prefix> + </mapper> + <includes>gen-cpp/**,gen-py/**,gen-rb/**</includes> + </data> + <data> <src>${accumulo-top}/bin</src> <type>directory</type> <mapper> @@ -409,6 +458,16 @@ <excludes>**/.svn/**</excludes> </data> <data> + <src>${accumulo-top}/examples/simple</src> + <type>directory</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/examples/simple</prefix> + </mapper> + <includes>src/main/**</includes> + <excludes>**/.svn/**</excludes> + </data> + <data> <src>${accumulo-top}/conf</src> <type>directory</type> <mapper> Modified: accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml?rev=1481935&r1=1481934&r2=1481935&view=diff ============================================================================== --- accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml (original) +++ accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml Mon May 13 15:43:29 2013 @@ -37,6 +37,15 @@ </includes> </fileSet> <fileSet> + <directory>../examples/simple</directory> + <outputDirectory>/examples/simple</outputDirectory> + <directoryMode>0755</directoryMode> + <fileMode>0644</fileMode> + <includes> + <include>src/main/**</include> + </includes> + </fileSet> + <fileSet> <directory>../lib/native</directory> <directoryMode>0755</directoryMode> <includes> @@ -128,13 +137,18 @@ <outputDirectory>proxy/thrift</outputDirectory> <includes> <include>gen-cpp/**</include> - <include>gen-java/**</include> <include>gen-py/**</include> <include>gen-rb/**</include> </includes> - <excludes> - <exclude>*</exclude> - </excludes> + </fileSet> + <fileSet> + <directory>../proxy/src/main/thrift</directory> + <directoryMode>0755</directoryMode> + <fileMode>0644</fileMode> + <outputDirectory>proxy/thrift</outputDirectory> + <includes> + <include>*.thrift</include> + </includes> </fileSet> </fileSets> <files>