From: Olivier Lamy <olamy@apache.org>
Date: Mon, 2 Apr 2012 10:45:53 +0000 (+0000)
Subject: startup.js is an archiva js so move it to archiva directory
X-Git-Tag: archiva-1.4-M3~872
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f2b03e81f1c64de556d1828d17fcf216455c1812;p=archiva.git

startup.js is an archiva js so move it to archiva directory

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1308295 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
index 0ec062ecb..35faced7a 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
@@ -80,6 +80,7 @@
                         "jquery": "jquery-1.7.2",
                         "jquery.tmpl": "jquery.tmpl",
                         "utils": "archiva/utils",
+                        "startup": "archiva/startup",
                         "jquery.ui": "jquery-ui-1.8.16.custom.min",
                         "jquery.ui.widget": "jquery.ui.widget-1.8.18",
                         "jquery.cookie": "jquery.cookie.1.0.0",
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
new file mode 100644
index 000000000..481d0df44
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+define("startup",["jquery","utils"],
+function() {
+
+  // define a container object with various datas
+  window.archivaModel = {};
+
+  $.log("devMode:"+window.archivaDevMode);
+
+  // no cache for ajax queries as we get datas from servers so preventing caching !!
+  jQuery.ajaxSetup( {
+    cache: false,//!window.archivaDevMode
+    dataType: 'json'
+  });
+  loadi18n();
+});
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/startup.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/startup.js
deleted file mode 100644
index 481d0df44..000000000
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/startup.js
+++ /dev/null
@@ -1,34 +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.
- */
-
-define("startup",["jquery","utils"],
-function() {
-
-  // define a container object with various datas
-  window.archivaModel = {};
-
-  $.log("devMode:"+window.archivaDevMode);
-
-  // no cache for ajax queries as we get datas from servers so preventing caching !!
-  jQuery.ajaxSetup( {
-    cache: false,//!window.archivaDevMode
-    dataType: 'json'
-  });
-  loadi18n();
-});
\ No newline at end of file