incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [18/19] git commit: Making some changes so that the blur-console artifact can be produced without the need to have all the webapp dev tools installed.
Date Tue, 17 Jun 2014 20:24:26 GMT
Making some changes so that the blur-console artifact can be produced without the need to have
all the webapp dev tools installed.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/0ad6ebff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/0ad6ebff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/0ad6ebff

Branch: refs/heads/apache-blur-0.2
Commit: 0ad6ebff5631b3768ae7c3c8a879c94be0d4b2de
Parents: e599710
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Tue Jun 17 16:18:38 2014 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue Jun 17 16:18:38 2014 -0400

----------------------------------------------------------------------
 blur-console/pom.xml                            |    2 +-
 blur-console/src/assemble/bin.xml               |   65 -
 blur-console/src/assemble/webapp.xml            |   37 +
 ...console.9c5692891382a5b44b51b02ec2798ef3.css | 6592 ++++++++++++++++++
 .../src/main/webapp/public/css/blurconsole.css  | 6592 ++++++++++++++++++
 ...ole.css.0212975e50782bb2f0d4b89d196e90dc.map |    7 +
 .../main/webapp/public/css/blurconsole.css.map  |    7 +
 .../public/css/glyphicons-halflings-regular.eot |  Bin 0 -> 20335 bytes
 .../public/css/glyphicons-halflings-regular.svg |  229 +
 .../public/css/glyphicons-halflings-regular.ttf |  Bin 0 -> 41280 bytes
 .../css/glyphicons-halflings-regular.woff       |  Bin 0 -> 23320 bytes
 .../src/main/webapp/public/img/ajax-loader.gif  |  Bin 0 -> 8787 bytes
 blur-console/src/main/webapp/public/index.html  |   67 +
 ...rconsole.fdfdf622e539d17c4daa4b622d866cd2.js |   27 +
 .../src/main/webapp/public/js/blurconsole.js    |   27 +
 ...sole.js.241e872aab2dd244acdeb1b403c6f2f6.map |    1 +
 .../main/webapp/public/js/blurconsole.js.map    |    1 +
 .../src/main/webapp/public/js/modernizr.js      | 1406 ++++
 .../main/webapp/public/views/dashboard.tpl.html |   61 +
 .../main/webapp/public/views/queries.tpl.html   |   40 +
 .../main/webapp/public/views/search.tpl.html    |   51 +
 .../main/webapp/public/views/tables.tpl.html    |   20 +
 .../src/main/scripts/bin/start-console.sh       |   35 +
 .../src/main/scripts/bin/stop-console.sh        |   33 +
 24 files changed, 15234 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0ad6ebff/blur-console/pom.xml
----------------------------------------------------------------------
diff --git a/blur-console/pom.xml b/blur-console/pom.xml
index 661e5ea..3234a30 100644
--- a/blur-console/pom.xml
+++ b/blur-console/pom.xml
@@ -135,7 +135,7 @@
                         </manifest>
                     </archive>
                     <descriptors>
-                        <descriptor>src/assemble/bin.xml</descriptor>
+                        <descriptor>src/assemble/webapp.xml</descriptor>
                     </descriptors>
                 </configuration>
                 <executions>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0ad6ebff/blur-console/src/assemble/bin.xml
----------------------------------------------------------------------
diff --git a/blur-console/src/assemble/bin.xml b/blur-console/src/assemble/bin.xml
deleted file mode 100644
index d5aadc5..0000000
--- a/blur-console/src/assemble/bin.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<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>bin</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <!-- <dependencySet>
-      <unpack>true</unpack>
-      <scope>provided</scope>
-      <useTransitiveDependencies>true</useTransitiveDependencies>
-      <includes>
-        <include>org.apache.blur:blur-thrift</include>
-        <include>org.apache.blur:blur-core</include>
-        <include>org.codehaus.jackson:*</include>
-      </includes>
-    </dependencySet> -->
-    <dependencySet>
-        <unpack>true</unpack>
-        <scope>runtime</scope>
-        <excludes>
-          <exclude>org.apache.blur:blur-core:test-jar</exclude>
-          <exclude>org.apache.blur:blur-util:test-jar</exclude>
-          <exclude>org.apache.hadoop:hadoop-test</exclude>
-          <exclude>org.apache.hadoop:hadoop-client</exclude>
-          <exclude>org.apache.hadoop:hadoop-minicluster</exclude>
-      </excludes>
-      <unpackOptions>
-        <excludes>
-            <exclude>**/blur-site.properties</exclude>
-        </excludes>
-      </unpackOptions>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>target/classes</directory>
-      <outputDirectory></outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/webapp/public</directory>
-      <outputDirectory>webapp</outputDirectory>
-    </fileSet>
-  </fileSets>
-</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0ad6ebff/blur-console/src/assemble/webapp.xml
----------------------------------------------------------------------
diff --git a/blur-console/src/assemble/webapp.xml b/blur-console/src/assemble/webapp.xml
new file mode 100644
index 0000000..c7d1d56
--- /dev/null
+++ b/blur-console/src/assemble/webapp.xml
@@ -0,0 +1,37 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<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>webapp</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory></outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/webapp/public</directory>
+      <outputDirectory>webapp</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>


Mime
View raw message