Module name fixes.

alexeyshockov · Dec 3, 2010 · 71d81e5 · 71d81e5
1 parent e402b24
commit 71d81e5
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 24 deletions.
diff --git a/build.xml b/build.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="ldaper" default="build-all" basedir=".">
+<project name="sh.ldaper" default="build-all" basedir=".">
 
     <property name="buildDirectory" value="./build" />
     <property name="sourceDirectory" value="./src" />
     <property name="testsDirectory" value="./tests" />
     <property name="bitrix.moduleVersion" value="1.0.0" />
+
+    <property name="pear.packageName" value="ldaper" />
 
     <!-- Current time... -->
     <tstamp>
         <format property="bitrix.moduleVersionDate" pattern="%F %T" />
     </tstamp>
-    
+
     <property name="tempDirectory" value="/tmp/${phing.project.name}-${bitrix.moduleVersion}-${bitrix.moduleVersionDate}" />
 
     <property name="package.summary" value="Bitrix LDAP authentication module" />
@@ -58,11 +60,11 @@
         <mkdir dir="${buildDirectory}" />
     </target>
 
-    <target 
-        name="prepare-sources-for-pear-package" 
-        depends="prepare-build-directory" 
+    <target
+        name="prepare-sources-for-pear-package"
+        depends="prepare-build-directory"
         description="Prepare files for PEAR package.">
-        <copy todir="${tempDirectory}/pear/${phing.project.name}-${bitrix.moduleVersion}">
+        <copy todir="${tempDirectory}/pear/${pear.packageName}-${bitrix.moduleVersion}">
             <filterchain>
                 <expandproperties />
                 <replaceregexp>
@@ -79,21 +81,21 @@
         </copy>
     </target>
 
-    <target 
-        name="build-all" 
-        depends="build-pear-package, build-marketplace-module, build-marketplace-module-update" 
+    <target
+        name="build-all"
+        depends="build-pear-package, build-marketplace-module, build-marketplace-module-update"
         description="Build all available types of packages.">
 
     </target>
 
-    <target 
-        name="build-pear-package" 
-        depends="run-tests, prepare-sources-for-pear-package" 
+    <target
+        name="build-pear-package"
+        depends="run-tests, prepare-sources-for-pear-package"
         description="Build PEAR package.">
-        <pearpkg2 name="${phing.project.name}" dir="${tempDirectory}/pear/${phing.project.name}-${bitrix.moduleVersion}">
+        <pearpkg2 name="${pear.packageName}" dir="${tempDirectory}/pear/${pear.packageName}-${bitrix.moduleVersion}">
             <option name="outputdirectory" value="${tempDirectory}/pear" />
             <option name="packagefile" value="package.xml" />
-            <option name="packagedirectory" value="${tempDirectory}/pear/${phing.project.name}-${bitrix.moduleVersion}" />
+            <option name="packagedirectory" value="${tempDirectory}/pear/${pear.packageName}-${bitrix.moduleVersion}" />
             <option name="baseinstalldir" value="capall" />
             <option name="channel" value="capall.shockov.com" />
             <option name="summary" value="${package.summary}" />
@@ -128,23 +130,23 @@
                     <element key="recommended" value="false" />
                 </element>
             </mapping>
-            <fileset dir="${tempDirectory}/pear/${phing.project.name}-${bitrix.moduleVersion}">
+            <fileset dir="${tempDirectory}/pear/${pear.packageName}-${bitrix.moduleVersion}">
                 <include name="**" />
             </fileset>
         </pearpkg2>
 
         <mkdir dir="${buildDirectory}/pear" />
 
-        <tar destfile="${buildDirectory}/pear/${phing.project.name}-${bitrix.moduleVersion}.tgz" compression="gzip">
+        <tar destfile="${buildDirectory}/pear/${pear.packageName}-${bitrix.moduleVersion}.tgz" compression="gzip">
             <fileset dir="${tempDirectory}/pear">
                 <include name="**" />
             </fileset>
         </tar>
     </target>
 
-    <target 
-        name="build-marketplace-module" 
-        depends="run-tests, prepare-build-directory" 
+    <target
+        name="build-marketplace-module"
+        depends="run-tests, prepare-build-directory"
         description="Build module for Bitrix marketplace.">
         <copy todir="${tempDirectory}/bitrix-marketplace/.last_version">
             <filterchain>

diff --git a/src/ldaper/classes/Capall/Ldaper.php → src/sh.ldaper/classes/Capall/Ldaper.php b/src/ldaper/classes/Capall/Ldaper.php → src/sh.ldaper/classes/Capall/Ldaper.php
diff --git a/...ll/Ldaper/BitrixUserCreationException.php → ...ll/Ldaper/BitrixUserCreationException.php b/...ll/Ldaper/BitrixUserCreationException.php → ...ll/Ldaper/BitrixUserCreationException.php
diff --git a/...asses/Capall/Ldaper/BitrixUserManager.php → ...asses/Capall/Ldaper/BitrixUserManager.php b/...asses/Capall/Ldaper/BitrixUserManager.php → ...asses/Capall/Ldaper/BitrixUserManager.php
diff --git a/...r/classes/Capall/Ldaper/LdapException.php → ...r/classes/Capall/Ldaper/LdapException.php b/...r/classes/Capall/Ldaper/LdapException.php → ...r/classes/Capall/Ldaper/LdapException.php
diff --git a/...ldaper/classes/Capall/Ldaper/LdapUser.php → ...ldaper/classes/Capall/Ldaper/LdapUser.php b/...ldaper/classes/Capall/Ldaper/LdapUser.php → ...ldaper/classes/Capall/Ldaper/LdapUser.php
diff --git a/...Ldaper/UnavailableDependencyException.php → ...Ldaper/UnavailableDependencyException.php b/...Ldaper/UnavailableDependencyException.php → ...Ldaper/UnavailableDependencyException.php
diff --git a/src/ldaper/default_option.php → src/sh.ldaper/default_option.php b/src/ldaper/default_option.php → src/sh.ldaper/default_option.php
diff --git a/src/ldaper/include.php → src/sh.ldaper/include.php b/src/ldaper/include.php → src/sh.ldaper/include.php
diff --git a/src/ldaper/install/index.php → src/sh.ldaper/install/index.php b/src/ldaper/install/index.php → src/sh.ldaper/install/index.php
diff --git a/src/ldaper/install/version.php → src/sh.ldaper/install/version.php b/src/ldaper/install/version.php → src/sh.ldaper/install/version.php
diff --git a/src/ldaper/lang/en/install/index.php → src/sh.ldaper/lang/en/install/index.php b/src/ldaper/lang/en/install/index.php → src/sh.ldaper/lang/en/install/index.php
diff --git a/src/ldaper/lang/en/options.php → src/sh.ldaper/lang/en/options.php b/src/ldaper/lang/en/options.php → src/sh.ldaper/lang/en/options.php
diff --git a/src/ldaper/lang/ru/install/index.php → src/sh.ldaper/lang/ru/install/index.php b/src/ldaper/lang/ru/install/index.php → src/sh.ldaper/lang/ru/install/index.php
diff --git a/src/ldaper/lang/ru/options.php → src/sh.ldaper/lang/ru/options.php b/src/ldaper/lang/ru/options.php → src/sh.ldaper/lang/ru/options.php
diff --git a/src/ldaper/options.php → src/sh.ldaper/options.php b/src/ldaper/options.php → src/sh.ldaper/options.php
diff --git a/src/ldaper/prolog.php → src/sh.ldaper/prolog.php b/src/ldaper/prolog.php → src/sh.ldaper/prolog.php
@@ -3,5 +3,5 @@
  * Required prolog for admin scripts.
  */
 
-define("ADMIN_MODULE_NAME", "ldaper");
+define("ADMIN_MODULE_NAME", "sh.ldaper");
 define("ADMIN_MODULE_ICON", "");
diff --git a/tests/AllTests.php b/tests/AllTests.php
@@ -20,7 +20,7 @@ class AllTests
 
     public static function suite()
     {
-        $suite = new PHPUnit_Framework_TestSuite('ldaper');
+        $suite = new PHPUnit_Framework_TestSuite('sh.ldaper');
 
         $suite->addTestSuite('Capall_Ldaper_Tests_LdaperTest.php');
         $suite->addTestSuite('Capall_Ldaper_Tests_LdapUserTest.php');

diff --git a/tests/Capall/Ldaper/Tests/BitrixUserManagerTest.php b/tests/Capall/Ldaper/Tests/BitrixUserManagerTest.php
@@ -6,7 +6,7 @@
  * @package Capall_Ldaper_Tests
  */
 
-require_once dirname(__FILE__).'/../../../../src/ldaper/classes/Capall/Ldaper.php';
+require_once dirname(__FILE__).'/../../../../src/sh.ldaper/classes/Capall/Ldaper.php';
 
 /**
  *

diff --git a/tests/Capall/Ldaper/Tests/LdapUserTest.php b/tests/Capall/Ldaper/Tests/LdapUserTest.php
@@ -6,7 +6,7 @@
  * @package Capall_Ldaper_Tests
  */
 
-require_once dirname(__FILE__).'/../../../../src/ldaper/classes/Capall/Ldaper.php';
+require_once dirname(__FILE__).'/../../../../src/sh.ldaper/classes/Capall/Ldaper.php';
 require_once 'Net/LDAP2.php';
 
 /**

diff --git a/tests/Capall/Ldaper/Tests/LdaperTest.php b/tests/Capall/Ldaper/Tests/LdaperTest.php
@@ -5,7 +5,7 @@
  * @package Capall_Ldaper_Tests
  */
 
-require_once dirname(__FILE__).'/../../../../src/ldaper/classes/Capall/Ldaper.php';
+require_once dirname(__FILE__).'/../../../../src/sh.ldaper/classes/Capall/Ldaper.php';
 require_once 'Net/LDAP2.php';
 
 /**