diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7f6113ca5..c461e8dc6 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -60,12 +60,6 @@ jobs: with: python-version: '3.12' - - name: Setup PHP Action - uses: shivammathur/setup-php@2.24.0 - with: - php-version: '5.6' - tools: composer - - name: Install Python dependencies run: pip install packaging jsonschema requests mkdocs diff --git a/prepare-upload.sh b/prepare-upload.sh index fb8501dd5..a8ca90b2e 100755 --- a/prepare-upload.sh +++ b/prepare-upload.sh @@ -19,24 +19,11 @@ cp -r examples upload/img/ # Merge repo JSON files into single file python merge_repo.py -# PWE data files for /repo/ endpoint +# Repo JSON and download packages mkdir -p upload/dat -cp site/dat/out.xml upload/dat/ cp -r site/dat/repo upload/dat/ cp -r site/files upload/ 2>/dev/null || true -# PHP for /repo/ endpoint (stays dynamic) -cp site/index.php upload/ -cp site/cfg.php upload/ -cp site/composer.json upload/ -cp -r site/JPGC upload/ - -php --version -curl -sS https://getcomposer.org/installer | php -cd upload -../composer.phar update --no-dev --prefer-stable -cd .. - cd upload zip -r site.zip * cd .. diff --git a/site/JPGC/PluginsRepository.php b/site/JPGC/PluginsRepository.php deleted file mode 100644 index 3b581ffe9..000000000 --- a/site/JPGC/PluginsRepository.php +++ /dev/null @@ -1,54 +0,0 @@ -getRepoFile(); - $max_age = 8 * 3600; - $this->PWE->sendHTTPHeader("Cache-Control: public, max-age=$max_age", true); - $this->PWE->sendHTTPHeader("Content-Type: application/json", true); - $this->PWE->sendHTTPHeader('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($repoFile)) . ' GMT', true); - - if ($_REQUEST['id']) { - $plugins = json_decode(file_get_contents($repoFile), true); - foreach ($plugins as $plugin) { - if ($plugin['id'] == $_REQUEST['id']) { - throw new HTTP2xxException(json_encode(array($plugin))); - } - } - } - - throw new HTTP2xxException(file_get_contents($repoFile)); - } - - private function getRepoFile() - { - $node = $this->PWE->getNode(); - $configsDir = $node['!a']['configs']; - if (!$configsDir || !is_dir($configsDir)) { - throw new HTTP5xxException("Configs dir don't exist: " . realpath($configsDir)); - } - $repoFile = $configsDir . '/repo.json'; - if (!is_file($repoFile)) { - throw new HTTP5xxException("Repo file not found: " . realpath($repoFile)); - } - return $repoFile; - } -} diff --git a/site/cfg.php b/site/cfg.php deleted file mode 100644 index cf0337c04..000000000 --- a/site/cfg.php +++ /dev/null @@ -1,33 +0,0 @@ -setRootDirectory(__DIR__); -$PWECore->setXMLDirectory($PWECore->getDataDirectory()); -$PWECore->setTempDirectory($tempdir); - -if ($isDebug) { - $fname = $tempdir . '/jpgc.xml'; - if (!is_file($fname)) { - file_put_contents($fname, ""); - } - - $PWECore->getModulesManager()->setRegistryFile($fname); -} diff --git a/site/composer.json b/site/composer.json deleted file mode 100644 index ed36bfb3f..000000000 --- a/site/composer.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "undera/jmeter-plugins", - "description": "Homepage for project JMeter-Plugins.org", - "minimum-stability": "dev", - "license": "Apache 2.0", - "authors": [ - { - "name": "Andrey Pokhilko", - "email": "apc4@ya.ru" - } - ], - "require": { - "php": ">=5.5.0", - "undera/pwe": "dev-master" - }, -"config": { - "platform": { - "php": "5.5.9" - } - } -} diff --git a/site/dat/counter.tpl b/site/dat/counter.tpl deleted file mode 100644 index 15ab8a7ec..000000000 --- a/site/dat/counter.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/site/dat/dl/all.wiki b/site/dat/dl/all.wiki deleted file mode 100644 index b872b3b7f..000000000 --- a/site/dat/dl/all.wiki +++ /dev/null @@ -1,13 +0,0 @@ -= Plugins Manager Download = - -The easiest way to get the plugins is to install [/wiki/PluginsManager/ Plugins Manager]. Then you'll be able to install any other plugins just by clicking chekbox. Plugins Manager is available from "Options" menu of JMeter. - -

-Download *[/get/ plugins-manager.jar]* and put it into {{{lib/ext}}} directory, then restart JMeter. -

- ----- - -See also: - - * [old Previous ZIP Releases] diff --git a/site/dat/dl/old.wiki b/site/dat/dl/old.wiki deleted file mode 100644 index e26ed533f..000000000 --- a/site/dat/dl/old.wiki +++ /dev/null @@ -1,142 +0,0 @@ -= Old-Style Releases = - -

-What you see here is the old approach for getting plugins. It has been outdated for several years and archives below are not up to date. -Consider using *[/wiki/PluginsManager/ Plugins Manager]* for benefits of modern JMeter plugins ecosystem. -

- - - - - - - - - - - - - ----- - - - - - - - - - - - ----- - - - - - - - - - - - ----- - - - - - - - - - - - ----- - - - - - - - - - - - ----- - - - - - - - - - ----- - - - - - - - - - - - ----- - - - - - - - - - - - ----- - - - - - ----- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/site/dat/dl/snapshots.wiki b/site/dat/dl/snapshots.wiki deleted file mode 100644 index 577f84028..000000000 --- a/site/dat/dl/snapshots.wiki +++ /dev/null @@ -1,5 +0,0 @@ -=Developer Snapshots= - -Developer builds are uploaded from master branch, in case of stable build. Use at your own risk. - - \ No newline at end of file diff --git a/site/dat/html/catalogue.html b/site/dat/html/catalogue.html deleted file mode 100644 index 3e75b168f..000000000 --- a/site/dat/html/catalogue.html +++ /dev/null @@ -1,202 +0,0 @@ -
- Apache JMeter -

Custom Plugins for Apache JMeter™

-

- This project is an independent set of plugins for Apache JMeter, - the popular Open-Source load and performance testing tool. -

-
-
- This catalogue lists plugins available for use with Plugins Manager. If you're first time here, consider - installing Plugins Manager into your JMeter. -
-
-

- - Items found: - - - -

-
-
-
-
- - - - diff --git a/site/dat/html/stats.html b/site/dat/html/stats.html deleted file mode 100644 index ee74294c6..000000000 --- a/site/dat/html/stats.html +++ /dev/null @@ -1,475 +0,0 @@ - - - - - -
- - -
-
- - -

Plugins Popularity

-By the number of known users: -
-
-
-
-
-
-
-
-
-
-
-
-
- - - diff --git a/site/dat/out.xml b/site/dat/out.xml deleted file mode 100755 index 95b7fc66d..000000000 --- a/site/dat/out.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/site/dat/plugins.tpl b/site/dat/plugins.tpl deleted file mode 100644 index bd04ad472..000000000 --- a/site/dat/plugins.tpl +++ /dev/null @@ -1,183 +0,0 @@ - -{assign var=i value='!i'}{assign var=a value='!a'}{assign var=p value='!p'}{assign var=c value='!c'} -{URL->getFullCount assign=urlFullCount} - - - - - - - {PWE->getCurrentModuleInstance assign="module"} - {if $module|is_a:'PWE\Modules\TitleGenerator'} - {$module->generateTitle() assign="title"} - {$title|default:$node.$i.title} - {else} - {$node.$i.title|default:$node.$a.link} - {/if} :: JMeter-Plugins.org - - - - - - - - - - - - - - - - - - - - - {if $smarty.server.SERVER_ADDR==$smarty.server.REMOTE_ADDR} - - {else} - - {/if} - - - - -
-
-
-
- {URL->getParamsCount assign=paramsCount} - {URL->getMatchedCount assign=matchCount} - {assign var=root value=$node} - {assign var=path value='../'|str_repeat:$paramsCount} - {while $root} - {if $root.$a.link} - {assign var=path value='../'|cat:$path} - {/if} - - {capture name=breadcrumbs} - {if $path != '../' || !$root.$p} - {if $root.$a.link} - {$root.$a.title|default:$root.$a.link} - {else} - {$root.$a.title|default:$root.$a.link} - {/if} - {if $smarty.capture.breadcrumbs|strlen}>{/if} - {$smarty.capture.breadcrumbs} - {else} - {$root.$a.title|default:$root.$a.link} - {$smarty.capture.breadcrumbs} - {/if} - {/capture} - {assign var=root value=$root.$p} - {/while} - - {if $smarty.capture.breadcrumbs} -
- {$smarty.capture.breadcrumbs} - {PWE->getCurrentModuleInstance assign="module"} - {if $module|is_a:'PWE\Modules\BreadcrumbsGenerator'} - {$module->generateBreadcrumbs() assign=bcrumbs} - - {foreach $bcrumbs as $item} - {if $item.selected} - > - {$item.$a.title} - {else} - > - {$item.$a.title} - {/if} - {/foreach} - {/if} -
- {/if} -
-
- -
- -
-
jmeter-plugins.org
-
Every load test needs some sexy features!
-
-
- BlocklyJMX -
-
- - {PWE->getStructLevel level=1 assign=level1} - {if $level1} - - {/if} -
- -
- - -
- {PWE->getContent} -
- - - - - - diff --git a/site/index.php b/site/index.php deleted file mode 100644 index 705bfb922..000000000 --- a/site/index.php +++ /dev/null @@ -1,2 +0,0 @@ -