Inicio Explorar Axuda
Iniciar sesión
apache
/
ambari
réplica de https://gitee.com/freeshow_me/ambari
2
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

AMBARI-591. License header for PHP files should use PHP comments, not HTML comments (Contributed by yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1356951 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako %!s(int64=13) %!d(string=hai) anos
pai
6a0685c6a6
achega
d8b2874176
Modificáronse 23 ficheiros con 117 adicións e 137 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 3 0
      CHANGES.txt
  2. 5 6
      hmc/html/addNodesWizard.php
  3. 4 5
      hmc/html/bootstrapJs.htmli
  4. 4 5
      hmc/html/footer.htmli
  5. 4 5
      hmc/html/head.htmli
  6. 3 5
      hmc/html/head.inc
  7. 5 6
      hmc/html/index.php
  8. 5 6
      hmc/html/initializeCluster.php
  9. 19 20
      hmc/html/installFailed.php
  10. 5 6
      hmc/html/manageServices.php
  11. 5 6
      hmc/html/reinstall.php
  12. 5 6
      hmc/html/showDeployAddedNodesProgress.php
  13. 5 6
      hmc/html/showDeployProgress.php
  14. 5 6
      hmc/html/showManageServicesProgress.php
  15. 5 6
      hmc/html/showUninstallProgress.php
  16. 4 5
      hmc/html/subnav.htmli
  17. 4 5
      hmc/html/topnav.htmli
  18. 4 5
      hmc/html/txnUtils.htmli
  19. 5 6
      hmc/html/uninstallFailed.php
  20. 5 6
      hmc/html/uninstallWizard.php
  21. 4 5
      hmc/html/utils.htmli
  22. 4 5
      hmc/html/welcome.inc
  23. 5 6
      hmc/html/welcome.php

+ 3 - 0
CHANGES.txt
Ver ficheiro 

@@ -6,6 +6,9 @@ characters wide.
 
 
 Release 1.0.0 - unreleased
 
 
+  AMBARI-591. License header for PHP files should use PHP comments,
 
+  not HTML comments (yusaku)
 
+
 
   Added notices where we use compatibly licensed third party libraries (vikram)
 
 
   Rat tool compliance on special files. (hitesh and vikram)

+ 5 - 6
hmc/html/addNodesWizard.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc" ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc" ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 4 - 5
hmc/html/bootstrapJs.htmli
Ver ficheiro 

@@ -1,5 +1,5 @@
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -16,9 +16,8 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
 <link type="text/css" rel="stylesheet" href="../css/yuiCombined.css">
 
 <script src="../js/ext/yui-min.js"></script>
 
 <script src="../js/ext/yuiCombined.js"></script>

+ 4 - 5
hmc/html/footer.htmli
Ver ficheiro 

@@ -1,5 +1,5 @@
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -16,9 +16,8 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
 <!-- START FOOTER -->
 
 	<div class="container">
 
 		<footer><?php echo $RES['page.footer.body'] ?></footer>

+ 4 - 5
hmc/html/head.htmli
Ver ficheiro 

@@ -1,5 +1,5 @@
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -16,9 +16,8 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
     <title id="pageTitleId"><?php echo $RES['page.title'] ?></title>
 
     <link type="text/css" rel="stylesheet" href="../css/cssreset-min.css">
 
     <link type="text/css" rel="stylesheet" href="../css/bootstrap.css" media="screen"/>

+ 3 - 5
hmc/html/head.inc
Ver ficheiro 

@@ -1,5 +1,5 @@
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -16,10 +16,8 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
+*/
 
 
--->
 
-
 
-<?php
 
 require_once '../php/conf/MessageResources-en.inc';
 
 require_once '../php/util/Logger.php';
 
 require_once '../php//conf/Config.inc';

+ 5 - 6
hmc/html/index.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc" ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc" ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 5 - 6
hmc/html/initializeCluster.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc"; ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc"; ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 19 - 20
hmc/html/installFailed.php
Ver ficheiro 

@@ -1,25 +1,24 @@
 
-<?php require_once "./head.inc" ?>
 
+<?php
 
 /*
 
- *
 
- * 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.
 
- *
 
-*/
 
+ 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.
 
+*/
 
+?>
 
+<?php require_once "./head.inc" ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 5 - 6
hmc/html/manageServices.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc" ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc" ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 5 - 6
hmc/html/reinstall.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc" ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc" ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 5 - 6
hmc/html/showDeployAddedNodesProgress.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc" ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc" ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 5 - 6
hmc/html/showDeployProgress.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc" ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc" ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 5 - 6
hmc/html/showManageServicesProgress.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc" ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc" ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 5 - 6
hmc/html/showUninstallProgress.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc" ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc" ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 4 - 5
hmc/html/subnav.htmli
Ver ficheiro 

@@ -1,5 +1,5 @@
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -16,9 +16,8 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
 <?php
 
 switch ($requestPage) {
 
 case 'html':

+ 4 - 5
hmc/html/topnav.htmli
Ver ficheiro 

@@ -1,5 +1,5 @@
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -16,9 +16,8 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
 <!-- START TOPNAV -->
 
  <?php 
     $homeUrl = '/hmc/html';

+ 4 - 5
hmc/html/txnUtils.htmli
Ver ficheiro 

@@ -1,5 +1,5 @@
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -16,9 +16,8 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
 <div id="txnProgressCoreDivId" style="display:none">
 
   <div id="txnProgressBox">
 
     <div id="txnProgressHeader"></div>

+ 5 - 6
hmc/html/uninstallFailed.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc" ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc" ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 5 - 6
hmc/html/uninstallWizard.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc" ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc" ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>

+ 4 - 5
hmc/html/utils.htmli
Ver ficheiro 

@@ -1,5 +1,5 @@
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -16,9 +16,8 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
 <!-- The mechanism by which we black out the screen and affix the
 
      the spotlight on a smaller portion of it. -->
 
 <div id="blackScreenDivId" style="display:none"></div>

+ 4 - 5
hmc/html/welcome.inc
Ver ficheiro 

@@ -1,5 +1,5 @@
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -16,9 +16,8 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
 <div class="alert alert-info" style="margin-top:40px;padding:20px">
 
   <h2 style="margin-bottom:10px"><?php echo $RES['welcome.header'] ?></h2>
 
   <p><?php echo $RES['welcome.body'] ?></p>

+ 5 - 6
hmc/html/welcome.php
Ver ficheiro 

@@ -1,6 +1,5 @@
 
-<?php require_once "./head.inc"; ?>
 
-<!--
 
-
 
+<?php
 
+/*
 
  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
 
@@ -17,9 +16,9 @@
 
  KIND, either express or implied.  See the License for the
 
  specific language governing permissions and limitations
 
  under the License.
 
-
 
--->
 
-
 
+*/
 
+?>
 
+<?php require_once "./head.inc"; ?>
 
 <html>
 
   <head>
 
     <?php require "./head.htmli" ?>