Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

API-CHANGE sapphire folder can now be renamed.

  • Loading branch information...
commit 1a532faa60394a7094635ddcc43746e808b20c89 1 parent 2bef7cd
Simon Welsh authored April 12, 2012 halkyon committed April 14, 2012
4  .htaccess
@@ -23,9 +23,9 @@ ErrorDocument 500 /assets/error-500.html
23 23
 
24 24
 	RewriteCond %{REQUEST_URI} ^(.*)$
25 25
 	RewriteCond %{REQUEST_FILENAME} !-f
26  
-	RewriteRule .* sapphire/main.php?url=%1 [QSA]
  26
+	RewriteRule .* framework/main.php?url=%1 [QSA]
27 27
 
28  
-	RewriteCond %{REQUEST_URI} ^(.*)/sapphire/main.php$
  28
+	RewriteCond %{REQUEST_URI} ^(.*)/framework/main.php$
29 29
 	RewriteCond %{REQUEST_FILENAME} !-f
30 30
 	RewriteRule . %1/install.php? [R,L]
31 31
 
4  Makefile
@@ -6,7 +6,7 @@
6 6
 #
7 7
 
8 8
 test:
9  
-	$(MAKE) QUERYSTRING="$(QUERYSTRING)" -C sapphire test
  9
+	$(MAKE) QUERYSTRING="$(QUERYSTRING)" -C framework test
10 10
 
11 11
 getallmodules:
12 12
 	if [ -d subsites ]; then svn update subsites; else svn co http://svn.silverstripe.com/open/modules/subsites/trunk subsites; fi
@@ -14,4 +14,4 @@ getallmodules:
14 14
 	if [ -d forum ]; then svn update forum; else svn co http://svn.silverstripe.com/open/modules/forum/trunk forum; fi
15 15
 	if [ -d cmsworkflow ]; then svn update cmsworkflow; else svn co http://svn.silverstripe.com/open/modules/cmsworkflow/trunk cmsworkflow; fi
16 16
 	if [ -d multiform ]; then svn update multiform; else svn co http://svn.silverstripe.com/open/modules/multiform/trunk multiform; fi
17  
-	if [ -d events ]; then svn update events; else svn co http://svn.silverstripe.com/open/modules/events/trunk events; fi
  17
+	if [ -d events ]; then svn update events; else svn co http://svn.silverstripe.com/open/modules/events/trunk events; fi
12  README.md
Source Rendered
@@ -2,22 +2,22 @@
2 2
 
3 3
 Base project folder for a SilverStripe ([http://silverstripe.org](http://silverstripe.org)) installation. Requires additional modules to function:
4 4
 
5  
- * [`sapphire`](http://github.com/silverstripe/sapphire): Module including the base framework
  5
+ * [`framework`](http://github.com/silverstripe/sapphire): Module including the base framework
6 6
  * [`cms`](http://github.com/silverstripe/silverstripe-cms): Module including a Content Management System
7 7
  * `themes/blackcandy` (optional)
8 8
 
9 9
 ## Server Requirements ##
10 10
 
11  
-See [doc.silverstripe.org](http://doc.silverstripe.org/sapphire/en/installation/server-requirements)
  11
+See [doc.silverstripe.org](http://doc.silverstripe.org/framework/en/installation/server-requirements)
12 12
 
13 13
 ## Installation ##
14 14
 
15  
-See [installation on different platforms](http://doc.silverstripe.org/sapphire/en/installation/),
16  
-and [installation from source](http://doc.silverstripe.org/sapphire/en/installation/from-source).
  15
+See [installation on different platforms](http://doc.silverstripe.org/framework/en/installation/),
  16
+and [installation from source](http://doc.silverstripe.org/framework/en/installation/from-source).
17 17
 
18 18
 ## Links ##
19 19
 
20  
- * [Changelogs](http://doc.silverstripe.org/sapphire/en/changelogs/)
  20
+ * [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/)
21 21
  * [Bugtracker](http://open.silverstripe.org)
22 22
  * [Forums](http://silverstripe.org/forums)
23 23
  * [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
@@ -40,4 +40,4 @@ and [installation from source](http://doc.silverstripe.org/sapphire/en/installat
40 40
 	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
41 41
 	GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
42 42
 	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
43  
-	OF SUCH DAMAGE.
  43
+	OF SUCH DAMAGE.
4  build.xml
@@ -233,7 +233,7 @@ Options:
233 233
 				<exclude name="tools/**" />
234 234
 				<exclude name="**/tests/**" />
235 235
 				<exclude name="cms/docs/**" />
236  
-				<exclude name="sapphire/docs/**" />
  236
+				<exclude name="framework/docs/**" />
237 237
 				<exclude name="build.xml" />
238 238
 				<exclude name="dependent-modules*" />
239 239
 				<exclude name="changelog-definitions*" />
@@ -247,7 +247,7 @@ Options:
247 247
 		</copy>
248 248
 
249 249
 		<!-- Write version info to the core folders (shouldn't be in version control) -->
250  
-		<echo msg="${version}" file="${tmp}/${archivename}/sapphire/silverstripe_version" />
  250
+		<echo msg="${version}" file="${tmp}/${archivename}/framework/silverstripe_version" />
251 251
 		<echo msg="${version}" file="${tmp}/${archivename}/cms/silverstripe_version" />
252 252
 
253 253
 		<!-- create tar archive -->
2  changelog-definitions.default
@@ -8,5 +8,5 @@
8 8
 #
9 9
 # <path> <from-commit> <to-commit>
10 10
 . 2.4.4-rc1 2.4.5
11  
-sapphire 2.4.4-rc1 2.4.5
  11
+framework 2.4.4-rc1 2.4.5
12 12
 cms 2.4.4-rc1 2.4.5
4  dependent-modules.default
@@ -14,7 +14,7 @@
14 14
 #
15 15
 # It is recommended to have sqlite3 and cms first with [run_dev_build] set to "false".
16 16
 # Having this set to 'false' prevents the execution of the dev/build process, meaning it can be
17  
-# deferred until all dependencies are in place, specifically the sapphire module. List
  17
+# deferred until all dependencies are in place, specifically the framework module. List
18 18
 # all additional modules after that. 
19 19
 #
20 20
 # Examples
@@ -24,7 +24,7 @@
24 24
 
25 25
 
26 26
 cms:master:2.4.5 git://github.com/silverstripe/silverstripe-cms.git
27  
-sapphire:master:2.4.5 git://github.com/silverstripe/sapphire.git
  27
+framework:master:2.4.5 git://github.com/silverstripe/sapphire.git
28 28
 
29 29
 
30 30
 
4  index.php
@@ -10,7 +10,7 @@
10 10
  ************************************************************************************/
11 11
 
12 12
 /**
13  
- * This script bolts on top of SilverStripe/Sapphire to allow access without the use of .htaccess
  13
+ * This script bolts on top of SilverStripe to allow access without the use of .htaccess
14 14
  * rewriting rules.
15 15
  */
16 16
 
@@ -60,4 +60,4 @@
60 60
 	die();
61 61
 }
62 62
 
63  
-require_once('sapphire/main.php');
  63
+require_once('framework/main.php');
10  install-sapphiremissing.html → install-frameworkmissing.html
... ...
@@ -1,7 +1,7 @@
1 1
 <html>
2 2
 	<head>
3  
-		<title>The sapphire module is missing</title>
4  
-		<link rel="stylesheet" type="text/css" href="sapphire/dev/install/css/install.css" />
  3
+		<title>The SilverStripe Framework is missing</title>
  4
+		<link rel="stylesheet" type="text/css" href="framework/dev/install/css/install.css" />
5 5
 	</head>
6 6
 	<body>
7 7
 		<div id="BgContainer">
@@ -15,12 +15,12 @@
15 15
 				
16 16
 				<div id="Layout">
17 17
 					<div class="typography">
18  
-						<p><strong>The sapphire module is missing</strong> - To run the installer, at least the 'sapphire' module and the 'simple' theme are required</p>
  18
+						<p><strong>The SilverStripe Framework is missing</strong> - To run the installer, at least the 'framework' module and the 'simple' theme are required</p>
19 19
 		
20 20
 						<p>If you downloaded a pre-packaged zip or tar.gz, something might have gone wrong with the packaging
21 21
 						process. Please try re-downloading, or try an older version</p>
22 22
 
23  
-						<p>If you downloaded this from github, you need to install the 'sapphire' and 'simple' theme code bases
  23
+						<p>If you downloaded this from github, you need to install the 'framework' and 'simple' theme code bases
24 24
 						in subdirectories of this directory. You can do this manually, or by running the tools/new-project
25 25
 						script from the command line</p>
26 26
 					</div>
@@ -34,4 +34,4 @@
34 34
 			</div>
35 35
 		</div>
36 36
 	</body>
37  
-</html>
  37
+</html>
4  install.php
@@ -9,5 +9,5 @@
9 9
  ************************************************************************************
10 10
  ************************************************************************************/
11 11
 
12  
-if (!file_exists('sapphire') || !file_exists('sapphire/_config.php')) include "install-sapphiremissing.html";
13  
-else include('./sapphire/dev/install/install.php');
  12
+if (!file_exists('framework') || !file_exists('framework/_config.php')) include "install-frameworkmissing.html";
  13
+else include('./framework/dev/install/install.php');
20  phpunit.xml.dist
... ...
@@ -1,19 +1,19 @@
1 1
 <!-- 
2 2
 	Usage: 
3 3
 	 - "phpunit": Runs all tests in all folders
4  
-	 - "phpunit sapphire/tests/": Run all tests of the sapphire module
5  
-	 - "phpunit sapphire/tests/filesystem": Run all filesystem tests within the sapphire module
6  
-	 - "phpunit sapphire/tests/filesystem/FolderTest.php": Run a single test
  4
+	 - "phpunit framework/tests/": Run all tests of the framework module
  5
+	 - "phpunit framework/tests/filesystem": Run all filesystem tests within the framework module
  6
+	 - "phpunit framework/tests/filesystem/FolderTest.php": Run a single test
7 7
 	 - "phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace <dash> with "-", requires xdebug)
8 8
 	
9 9
 	Further information:
10 10
 	- http://www.phpunit.de/manual/current/en/textui.html for more commandline options.
11 11
 	- http://github.com/chillu/silverstripe-doc-restructuring/blob/master/master/cms/docs/en/howto/phpunit-configuration.md
12 12
 	  for more information on configuration and execution options.
13  
-	- sapphire/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
  13
+	- framework/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
14 14
 -->
15 15
 <phpunit 
16  
-	bootstrap="sapphire/tests/bootstrap.php"
  16
+	bootstrap="framework/tests/bootstrap.php"
17 17
 	colors="true"
18 18
 >
19 19
 	<testsuite name="Default">
@@ -22,15 +22,15 @@
22 22
 	
23 23
 	<filter>
24 24
 		<blacklist>
25  
-			<directory suffix=".php">sapphire/dev/</directory>
26  
-			<directory suffix=".php">sapphire/thirdparty/</directory>
  25
+			<directory suffix=".php">framework/dev/</directory>
  26
+			<directory suffix=".php">framework/thirdparty/</directory>
27 27
 			<directory suffix=".php">cms/thirdparty/</directory>
28  
-			<file>sapphire/tests/PhpSyntaxTest.php</file>
  28
+			<file>framework/tests/PhpSyntaxTest.php</file>
29 29
 		</blacklist>
30 30
 	</filter>
31 31
 	
32 32
 	<listeners>
33  
-		<listener class="SS_TestListener" file="sapphire/dev/TestListener.php">
  33
+		<listener class="SS_TestListener" file="framework/dev/TestListener.php">
34 34
 		</listener>
35 35
 	</listeners>
36 36
 	
@@ -40,4 +40,4 @@
40 40
 		</exclude>
41 41
 	</groups>
42 42
 	
43  
-</phpunit>
  43
+</phpunit>
4  rewritetest.php
@@ -83,7 +83,7 @@ function createHtaccess() {
83 83
 
84 84
 RewriteCond %{REQUEST_URI} ^(.*)$
85 85
 RewriteCond %{REQUEST_FILENAME} !-f
86  
-RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L]
  86
+RewriteRule .* framework/main.php?url=%1&%{QUERY_STRING} [L]
87 87
 TEXT
88 88
 	;
89 89
 	
@@ -114,7 +114,7 @@ function createHtaccessAlternative() {
114 114
 
115 115
 RewriteCond %{REQUEST_URI} ^(.*)$
116 116
 RewriteCond %{REQUEST_FILENAME} !-f
117  
-RewriteRule .* $_SERVER[DOCUMENT_ROOT]/sapphire/main.php?url=%1&%{QUERY_STRING} [L]
  117
+RewriteRule .* $_SERVER[DOCUMENT_ROOT]/framework/main.php?url=%1&%{QUERY_STRING} [L]
118 118
 TEXT
119 119
 	;
120 120
 	
8  tools/CreateChangelog.php
@@ -27,7 +27,7 @@ class CreateChangelog extends SilverStripeBuildTask {
27 27
 	
28 28
 	public $commitUrls = array(
29 29
 		'.' => 'https://github.com/silverstripe/silverstripe-installer/commit/%s',
30  
-		'sapphire' => 'https://github.com/silverstripe/sapphire/commit/%s',
  30
+		'framework' => 'https://github.com/silverstripe/sapphire/commit/%s',
31 31
 		'cms' => 'https://github.com/silverstripe/silverstripe-cms/commit/%s',
32 32
 		'themes/blackcandy' => 'https://github.com/silverstripe-themes/silverstripe-blackcandy/commit/%s',
33 33
 	);
@@ -204,9 +204,9 @@ public function main() {
204 204
 			if (count($bits) == 1) {
205 205
 				$repos[$bits[0]] = "";
206 206
 			} elseif (count($bits) == 2) {
207  
-				$repos[$bits[0]] = array($bits[1], null);    //sapphire => array(from => HEAD)
  207
+				$repos[$bits[0]] = array($bits[1], null);    //framework => array(from => HEAD)
208 208
 			} elseif (count($bits) == 3) {
209  
-				$repos[$bits[0]] = array($bits[1],$bits[2]);    //sapphire => array(from => to)
  209
+				$repos[$bits[0]] = array($bits[1],$bits[2]);    //framework => array(from => to)
210 210
 			} else {
211 211
 				continue;
212 212
 			}
@@ -299,4 +299,4 @@ public function main() {
299 299
 	}
300 300
 }
301 301
 
302  
-?>
  302
+?>
6  tools/SilverStripeBuildTask.php
@@ -40,9 +40,9 @@ function cleanEnv() {
40 40
 	}
41 41
 
42 42
 	function devBuild() {
43  
-		if (file_exists('sapphire/cli-script.php')) {
  43
+		if (file_exists('framework/cli-script.php')) {
44 44
 			$this->log("Running dev/build");
45  
-			$this->exec('php sapphire/cli-script.php dev/build');
  45
+			$this->exec('php framework/cli-script.php dev/build');
46 46
 		}
47 47
 	}
48 48
 	
@@ -81,4 +81,4 @@ function exec($cmd, $returnContent = false, $ignoreError = false) {
81 81
 		
82 82
 		return $ret;
83 83
 	}
84  
-}
  84
+}
8  tools/lib/template.php
@@ -6,20 +6,20 @@
6 6
 */
7 7
 
8 8
 $template = array(
9  
-	'sapphire' => new Github(array(
  9
+	'framework' => new Github(array(
10 10
 		'user' => 'silverstripe', 
11 11
 		'project' => 'sapphire', 
12  
-		'branch' => SAPPHIRE_CURRENT_BRANCH
  12
+		'branch' => FRAMEWORK_CURRENT_BRANCH
13 13
 	)),
14 14
 	'cms' => new Github(array(
15 15
 		'user' => 'silverstripe', 
16 16
 		'project' => 'silverstripe-cms',
17  
-		'branch' => SAPPHIRE_CURRENT_BRANCH
  17
+		'branch' => FRAMEWORK_CURRENT_BRANCH
18 18
 	)),
19 19
 	'themes/simple' => new GithubSparse(array(
20 20
 		'user' => 'silverstripe-themes', 
21 21
 		'project' => 'silverstripe-simple',
22  
-		'branch' => SAPPHIRE_CURRENT_BRANCH,
  22
+		'branch' => FRAMEWORK_CURRENT_BRANCH,
23 23
 		'subdir' => ''
24 24
 	))
25 25
 );
3  tools/versions.php
... ...
@@ -1,3 +1,4 @@
1 1
 <?php
2 2
 
3  
-define('SAPPHIRE_CURRENT_BRANCH', 'master');
  3
+define('FRAMEWORK_CURRENT_BRANCH', 'master');
  4
+define('SAPPHIRE_CURRENT_BRANCH', FRAMEWORK_CURRENT_BRANCH);

0 notes on commit 1a532fa

Please sign in to comment.
Something went wrong with that request. Please try again.