Skip to content

Commit

Permalink
Renames Arcavias to Aimeos to avoid branding issues
Browse files Browse the repository at this point in the history
  • Loading branch information
aimeos committed Sep 30, 2015
1 parent b45e3ed commit 0036cbe
Show file tree
Hide file tree
Showing 272 changed files with 800 additions and 4,104 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Arcavias core developers
Aimeos core developers

Main developers:
- Norbert Sendetzky (Design and Implementation)
Expand Down
6 changes: 3 additions & 3 deletions Arcavias.php → Aimeos.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* Global starting point for applicatons.
*/
class Arcavias
class Aimeos
{
private $_manifests = array();
private $_extensions = array();
Expand All @@ -24,7 +24,7 @@ class Arcavias
*
* @param array $extdirs List of directories to look for manifest files (or sub-directories thereof)
* @param boolean $defaultdir If default extension directory should be included automatically
* @param string|null $basedir Arcavias core path (optional, dirname(__FILE__) if null)
* @param string|null $basedir Aimeos core path (optional, dirname(__FILE__) if null)
*/
public function __construct( array $extdirs = array(), $defaultdir = true, $basedir = null )
{
Expand Down Expand Up @@ -285,7 +285,7 @@ protected function _getManifestFile( $dir )


/**
* Registers the Arcavias autoloader.
* Registers the Aimeos autoloader.
*/
protected function _registerAutoloader()
{
Expand Down
8 changes: 4 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<project name="Arcavias" default="all">
<project name="Aimeos" default="all">

<property name="coredir" value="${project.basedir}" override="false" />
<property name="extdir" value="${project.basedir}/ext" override="false" />
Expand Down Expand Up @@ -193,7 +193,7 @@
<exec command="composer require phpdocumentor/phpdocumentor:2.3.*" checkreturn="true" logoutput="true" />
<exec command="${coredir}/vendor/bin/phpdoc.php --sourcecode -t ${coredir}/misc/apidoc
-d client/html/src -d controller/frontend/src -d controller/extjs/src
-d controller/jobs/src -d lib/mshoplib/src -d lib/mwlib/src -f Arcavias.php
-d controller/jobs/src -d lib/mshoplib/src -d lib/mwlib/src -f Aimeos.php
--template=responsive-twig" checkreturn="true" logoutput="true" />
</target>

Expand Down Expand Up @@ -252,9 +252,9 @@

<target name="deploy" description="Executes all deployments" depends="clean,build">
<propertyprompt propertyName="version" promptText="Enter release version" promptCharacter=":" useExistingValue="true"/>
<exec command="tar -c --bzip2 --exclude-from=.exclude -f ../arcavias-core_${version}.tar.bz2 ."
<exec command="tar -c --bzip2 --exclude-from=.exclude -f ../aimeos-core_${version}.tar.bz2 ."
checkreturn="true" logoutput="true"/>
<filehash file="../arcavias-core_${version}.tar.bz2" hashtype="1" />
<filehash file="../aimeos-core_${version}.tar.bz2" hashtype="1" />
<echo msg="SHA1 hash value: ${filehashvalue}" />
</target>

Expand Down
2 changes: 1 addition & 1 deletion client/extjs/build.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<project name="Arcavias ExtJS client" default="all">
<project name="Aimeos ExtJS client" default="all">

<target name="check" description="Checks javascript files for common mistakes">
<echo msg="Executing Javascript Linter" />
Expand Down
6 changes: 3 additions & 3 deletions client/extjs/deploy/js/arcavias-core.js
Original file line number Diff line number Diff line change
Expand Up @@ -6973,7 +6973,7 @@ MShop.panel.media.ListUiSmall = Ext.extend(MShop.panel.AbstractListUi, {
},

previewRenderer : function(preview) {
return '<img class="arcavias-admin-media-list-preview" src="' + MShop.urlManager.getAbsoluteUrl(preview) +
return '<img class="aimeos-admin-media-list-preview" src="' + MShop.urlManager.getAbsoluteUrl(preview) +
'" />';
}
});
Expand Down Expand Up @@ -7223,7 +7223,7 @@ MShop.panel.media.ItemPickerUi = Ext.extend(MShop.panel.AbstractListItemPickerUi

refPreviewRenderer : function(refId, metaData, record, rowIndex, colIndex, store) {
var refItem = this.getRefStore().getById(refId);
return (refItem ? '<img class="arcavias-admin-media-list-preview" src="' +
return (refItem ? '<img class="aimeos-admin-media-list-preview" src="' +
MShop.urlManager.getAbsoluteUrl(refItem.get('media.preview')) + '" />' : '');
}
});
Expand Down Expand Up @@ -7315,7 +7315,7 @@ MShop.panel.media.MediaField = Ext.extend(Ext.form.Field, {
*/
defaultImage : 'mimeicons/unknown.png',

cls : 'arcavias-admin-media-item-preview',
cls : 'aimeos-admin-media-item-preview',

defaultAutoCreate : {
tag : 'input',
Expand Down
Binary file modified client/extjs/i18n/en
Binary file not shown.
8 changes: 4 additions & 4 deletions client/extjs/i18n/en.po
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# English translations for arcavias-core (ExtJs client).
# English translations for aimeos-core (ExtJs client).
# Copyright (C) 2014
# This file is distributed under the same license as the arcavias-core package.
# This file is distributed under the same license as the aimeos-core package.
# Norbert Sendetzky <n.sendetzky@metaways.de>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: Arcavias\n"
"Project-Id-Version: Aimeos\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-29 14:16+0200\n"
"PO-Revision-Date: 2014-01-29 12:00+0100\n"
"Last-Translator: Norbert Sendetzky <n.sendetzky@metaways.de>\n"
"Language-Team: English (http://www.transifex.com/projects/p/arcavias/language/en/)\n"
"Language-Team: English (http://www.transifex.com/projects/p/aimeos/language/en/)\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
Binary file modified client/extjs/i18n/ext/en
Binary file not shown.
8 changes: 4 additions & 4 deletions client/extjs/i18n/ext/en.po
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# English translations for arcavias-core (ExtJs client).
# English translations for aimeos-core (ExtJs client).
# Copyright (C) 2014
# This file is distributed under the same license as the arcavias-core package.
# This file is distributed under the same license as the aimeos-core package.
# Norbert Sendetzky <n.sendetzky@metaways.de>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: Arcavias\n"
"Project-Id-Version: Aimeos\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-09-10 22:41+0200\n"
"PO-Revision-Date: 2014-01-29 12:00+0100\n"
"Last-Translator: Norbert Sendetzky <n.sendetzky@metaways.de>\n"
"Language-Team: English (http://www.transifex.com/projects/p/arcavias/language/en/)\n"
"Language-Team: English (http://www.transifex.com/projects/p/aimeos/language/en/)\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
10 changes: 5 additions & 5 deletions client/extjs/manifest.jsb2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"projectName": "Arcavias Core",
"projectName": "Aimeos Core",
"deployDir": "deploy",
"licenseText": "LGPLv3, http://www.gnu.org/licenses/lgpl.html",
"pkgs": [{
Expand All @@ -14,8 +14,8 @@
"path": "lib/extjs/resources/css/"
}]
}, {
"name": "Arcavias Admin Core CSS",
"file": "resources/css/arcavias-core.css",
"name": "Aimeos Admin Core CSS",
"file": "resources/css/aimeos-core.css",
"isDebug": true,
"fileIncludes": [{
"text": "main.css",
Expand All @@ -39,8 +39,8 @@
"path": "lib/extjs/"
}]
}, {
"name": "Arcavias Core",
"file": "js/arcavias-core.js",
"name": "Aimeos Core",
"file": "js/aimeos-core.js",
"isDebug": true,
"fileIncludes": [{
"text": "ext-override.js",
Expand Down
4 changes: 2 additions & 2 deletions client/extjs/resources/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
left: 0px;
}

.arcavias-admin-media-list-preview {
.aimeos-admin-media-list-preview {
max-width: 90px;
max-height: 70px;
}

.arcavias-admin-media-item-preview {
.aimeos-admin-media-item-preview {
max-width: 360px;
max-height: 280px;
}
Expand Down
2 changes: 1 addition & 1 deletion client/extjs/src/panel/media/ItemPickerUi.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ MShop.panel.media.ItemPickerUi = Ext.extend(MShop.panel.AbstractListItemPickerUi

refPreviewRenderer : function(refId, metaData, record, rowIndex, colIndex, store) {
var refItem = this.getRefStore().getById(refId);
return (refItem ? '<img class="arcavias-admin-media-list-preview" src="' +
return (refItem ? '<img class="aimeos-admin-media-list-preview" src="' +
MShop.urlManager.getAbsoluteUrl(refItem.get('media.preview')) + '" />' : '');
}
});
Expand Down
2 changes: 1 addition & 1 deletion client/extjs/src/panel/media/ListUiSmall.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ MShop.panel.media.ListUiSmall = Ext.extend(MShop.panel.AbstractListUi, {
},

previewRenderer : function(preview) {
return '<img class="arcavias-admin-media-list-preview" src="' + MShop.urlManager.getAbsoluteUrl(preview) +
return '<img class="aimeos-admin-media-list-preview" src="' + MShop.urlManager.getAbsoluteUrl(preview) +
'" />';
}
});
Expand Down
2 changes: 1 addition & 1 deletion client/extjs/src/panel/media/MediaField.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ MShop.panel.media.MediaField = Ext.extend(Ext.form.Field, {
*/
defaultImage : 'mimeicons/unknown.png',

cls : 'arcavias-admin-media-item-preview',
cls : 'aimeos-admin-media-item-preview',

defaultAutoCreate : {
tag : 'input',
Expand Down
2 changes: 1 addition & 1 deletion client/html/build.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<project name="Arcavias HTML client" default="all">
<project name="Aimeos HTML client" default="all">

<target name="test" description="Executes unit tests">
<echo msg="Executing unit tests" />
Expand Down
2 changes: 1 addition & 1 deletion client/html/i18n/code/core-client-html-code.pot
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: Arcavias\n"
"Project-Id-Version: Aimeos\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-09 09:14+0200\n"
"PO-Revision-Date: 2013-04-23 11:56+0000\n"
Expand Down
Binary file modified client/html/i18n/code/en
Binary file not shown.
6 changes: 3 additions & 3 deletions client/html/i18n/code/en.po
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# English translations for arcavias-core (HTML client codes).
# English translations for aimeos-core (HTML client codes).
# Copyright (C) 2013
# This file is distributed under the same license as the arcavias-core package.
# This file is distributed under the same license as the aimeos-core package.
# Norbert Sendetzky <n.sendetzky@metaways.de>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: Arcavias\n"
"Project-Id-Version: Aimeos\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-09 09:14+0200\n"
"PO-Revision-Date: 2013-01-18 16:33+0100\n"
Expand Down
2 changes: 1 addition & 1 deletion client/html/i18n/country/core-client-html-country.pot
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: Arcavias\n"
"Project-Id-Version: Aimeos\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-09 09:14+0200\n"
"PO-Revision-Date: 2013-04-16 15:57+0000\n"
Expand Down
Binary file modified client/html/i18n/country/en
Binary file not shown.
6 changes: 3 additions & 3 deletions client/html/i18n/country/en.po
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# English translations for arcavias-core (HTML client countries).
# English translations for aimeos-core (HTML client countries).
# Copyright (C) 2013
# This file is distributed under the same license as the arcavias-core package.
# This file is distributed under the same license as the aimeos-core package.
# Norbert Sendetzky <n.sendetzky@metaways.de>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: Arcavias\n"
"Project-Id-Version: Aimeos\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-11 16:24+0200\n"
"PO-Revision-Date: 2012-12-24 16:33+0100\n"
Expand Down
2 changes: 1 addition & 1 deletion client/html/i18n/currency/core-client-html-currency.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: Arcavias\n"
"Project-Id-Version: Aimeos\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-09 09:14+0200\n"
"PO-Revision-Date: 2013-04-16 15:58+0000\n"
Expand Down
Binary file modified client/html/i18n/currency/en
Binary file not shown.
8 changes: 4 additions & 4 deletions client/html/i18n/currency/en.po
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Englisch translation for arcavias-core (HTML client currencies).
# Englisch translation for aimeos-core (HTML client currencies).
# Copyright (C) 2013
# This file is distributed under the same license as the arcavias-core package.
# This file is distributed under the same license as the aimeos-core package.
# Daniel Hoffmann <d.hoffmann@metaways.de>, 2013.
#
#
msgid ""
msgstr ""
"Project-Id-Version: Arcavias\n"
"Project-Id-Version: Aimeos\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-09 09:14+0200\n"
"PO-Revision-Date: 2013-04-11 18:00+0200\n"
"Last-Translator: Daniel Hoffmann <d.hoffmann@metaways.de>\n"
"Language-Team: English (http://www.transifex.com/projects/p/arcavias/language/en/)\n"
"Language-Team: English (http://www.transifex.com/projects/p/aimeos/language/en/)\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
Binary file modified client/html/i18n/en
Binary file not shown.
8 changes: 4 additions & 4 deletions client/html/i18n/en.po
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# English translations for arcavias-core (HTML client).
# English translations for aimeos-core (HTML client).
# Copyright (C) 2013
# This file is distributed under the same license as the arcavias-core package.
# This file is distributed under the same license as the aimeos-core package.
# Norbert Sendetzky <n.sendetzky@metaways.de>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: Arcavias\n"
"Project-Id-Version: Aimeos\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-29 14:45+0200\n"
"PO-Revision-Date: 2012-12-24 16:33+0100\n"
"Last-Translator: Norbert Sendetzky <n.sendetzky@metaways.de>\n"
"Language-Team: English (http://www.transifex.com/projects/p/arcavias/language/en/)\n"
"Language-Team: English (http://www.transifex.com/projects/p/aimeos/language/en/)\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
2 changes: 1 addition & 1 deletion client/html/i18n/language/core-client-html-language.pot
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: Arcavias\n"
"Project-Id-Version: Aimeos\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-09 09:14+0200\n"
"PO-Revision-Date: 2013-04-16 15:58+0000\n"
Expand Down
Binary file modified client/html/i18n/language/en
Binary file not shown.
8 changes: 4 additions & 4 deletions client/html/i18n/language/en.po
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# English translations for arcavias-core (HTML client languages).
# English translations for aimeos-core (HTML client languages).
# Copyright (C) 2013
# This file is distributed under the same license as the arcavias-core package.
# This file is distributed under the same license as the aimeos-core package.
# Norbert Sendetzky <n.sendetzky@metaways.de>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: Arcavias\n"
"Project-Id-Version: Aimeos\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-11 16:24+0200\n"
"PO-Revision-Date: 2012-12-24 16:33+0100\n"
"Last-Translator: Norbert Sendetzky <n.sendetzky@metaways.de>\n"
"Language-Team: English (http://www.transifex.com/projects/p/arcavias/language/en/)\n"
"Language-Team: English (http://www.transifex.com/projects/p/aimeos/language/en/)\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
2 changes: 1 addition & 1 deletion client/html/layouts/email/common/html-body-default.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<html>
<head>
<title><?php echo $enc->html( $title, $enc::TRUST ); ?></title>
<meta name="application-name" content="Arcavias" />
<meta name="application-name" content="Aimeos" />
</head>
<body>
<style type="text/css">
Expand Down
6 changes: 3 additions & 3 deletions client/html/src/Client/Html/Basket/Abstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected function _clearCached()
{
$session = $this->_getContext()->getSession();

foreach( $session->get( 'arcavias/basket/cache', array() ) as $key => $value ) {
foreach( $session->get( 'aimeos/basket/cache', array() ) as $key => $value ) {
$session->set( $key, null );
}
}
Expand Down Expand Up @@ -72,8 +72,8 @@ protected function _setBasketCached( $key, $value )
{
$session = $context->getSession();

$cached = $session->get( 'arcavias/basket/cache', array() ) + array( $key => true );
$session->set( 'arcavias/basket/cache', $cached );
$cached = $session->get( 'aimeos/basket/cache', array() ) + array( $key => true );
$session->set( 'aimeos/basket/cache', $cached );
$session->set( $key, $value );
}
}
Expand Down
2 changes: 1 addition & 1 deletion client/html/src/Client/Html/Basket/Standard/Default.php
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ protected function _setViewParams( MW_View_Interface $view, array &$tags = array
if( !isset( $this->_cache ) )
{
$context = $this->_getContext();
$params = $context->getSession()->get( 'arcavias/catalog/detail/params/last', array() );
$params = $context->getSession()->get( 'aimeos/catalog/detail/params/last', array() );

$target = $view->config( 'client/html/catalog/detail/url/target' );
$controller = $view->config( 'client/html/catalog/detail/url/controller', 'catalog' );
Expand Down
2 changes: 1 addition & 1 deletion client/html/src/Client/Html/Catalog/Detail/Default.php
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ public function process()
try
{
$params = $this->_getClientParams( $view->param() );
$context->getSession()->set( 'arcavias/catalog/detail/params/last', $params );
$context->getSession()->set( 'aimeos/catalog/detail/params/last', $params );

parent::process();
}
Expand Down
Loading

0 comments on commit 0036cbe

Please sign in to comment.